diff options
Diffstat (limited to 'nixpkgs/pkgs/applications')
946 files changed, 21456 insertions, 16074 deletions
diff --git a/nixpkgs/pkgs/applications/accessibility/contrast/default.nix b/nixpkgs/pkgs/applications/accessibility/contrast/default.nix index 3a10bd72d309..3858de921592 100644 --- a/nixpkgs/pkgs/applications/accessibility/contrast/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/contrast/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; + mainProgram = "contrast"; }; } diff --git a/nixpkgs/pkgs/applications/accessibility/dasher/default.nix b/nixpkgs/pkgs/applications/accessibility/dasher/default.nix index c159f2579eae..0de562c5331b 100644 --- a/nixpkgs/pkgs/applications/accessibility/dasher/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/dasher/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; maintainers = [ ]; platforms = lib.platforms.all; + mainProgram = "dasher"; }; } diff --git a/nixpkgs/pkgs/applications/accessibility/espeakup/default.nix b/nixpkgs/pkgs/applications/accessibility/espeakup/default.nix index 00f432ff4138..a0adef6aa935 100644 --- a/nixpkgs/pkgs/applications/accessibility/espeakup/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/espeakup/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ethindp ]; platforms = with platforms; linux; + mainProgram = "espeakup"; }; } diff --git a/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix b/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix index 815b956da8e1..847002c6d711 100644 --- a/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.johnazoidberg ]; + mainProgram = "mousetweaks"; }; } diff --git a/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix b/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix index f9cad958c02c..cc1951e4caea 100644 --- a/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "svkbd-mobile-intl"; }; } diff --git a/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix b/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix index 2d706b4204ce..65cbf91676cb 100644 --- a/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.elohmeier ]; platforms = platforms.linux; license = licenses.gpl3Plus; + mainProgram = "wvkbd-mobintl"; }; } diff --git a/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix index 4b40069eaef5..e74b660b1c54 100644 --- a/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix +++ b/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "alsa-scarlett-gui"; - version = "unstable-2022-08-11"; + version = "0.3.2"; src = fetchFromGitHub { owner = "geoffreybennett"; repo = pname; - rev = "65c0f6aa432501355803a823be1d3f8aafe907a8"; + rev = version; sha256 = "sha256-wzBOPTs8PTHzu5RpKwKhx552E7QnDx2Zn4OFaes8Q2I="; }; diff --git a/nixpkgs/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix index 05094d655b9d..f476b3c8a8e6 100644 --- a/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -30,7 +30,7 @@ , libid3tag , libopus , libuuid -, ffmpeg_4 +, ffmpeg_6 , soundtouch , pcre , portaudio # given up fighting their portaudio.patch? @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-g9VdwVRrZrIKd4VUU12C691aM2ilgTJdW5Ic7sokk4M="; + hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ="; }; postPatch = '' @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg_4 + ffmpeg_6 file flac gtk3 @@ -171,12 +171,15 @@ stdenv.mkDerivation rec { doCheck = false; # Test fails + dontWrapGApps = true; + # Replace audacity's wrapper, to: # - put it in the right place, it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency - postInstall = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' wrapProgram "$out/bin/audacity" \ - --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_4 ]} \ + "''${gappsWrapperArgs[@]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_6 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" '' + lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/applications/audio/butt/default.nix b/nixpkgs/pkgs/applications/audio/butt/default.nix deleted file mode 100644 index 01e35f9450e7..000000000000 --- a/nixpkgs/pkgs/applications/audio/butt/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, fltk13, portaudio, lame, libvorbis, libogg -, flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl }: - -stdenv.mkDerivation rec { - pname = "butt"; - version = "0.1.39"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-dh6NceHiqpN6PVwKIo2jV3qCO17P6E6QHdZGRVyd6/g="; - }; - - postPatch = '' - # remove advertising - substituteInPlace src/FLTK/flgui.cpp \ - --replace 'idata_radio_co_badge, 124, 61, 4,' 'nullptr, 0, 0, 0,' - ''; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - fltk13 - portaudio - lame - libvorbis - libogg - flac - libopus - libsamplerate - fdk_aac - dbus - openssl - curl - ]; - - postInstall = '' - cp -r usr/share $out/ - ''; - - meta = { - description = - "butt (broadcast using this tool) is an easy to use, multi OS streaming tool"; - homepage = "https://danielnoethen.de/butt/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ehmry ]; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/cider/default.nix b/nixpkgs/pkgs/applications/audio/cider/default.nix index e6bd6aafe7ad..c71f6fa0bc78 100644 --- a/nixpkgs/pkgs/applications/audio/cider/default.nix +++ b/nixpkgs/pkgs/applications/audio/cider/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "cider"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/ciderapp/Cider/releases/download/v${version}/Cider-${version}.AppImage"; - sha256 = "sha256-t3kslhb6STPemdBN6fXc8jcPgNrlnGzcAUQ3HAUB7Yw="; + sha256 = "sha256-43QmTnFp8raEyZO5NK/UlRM8Ykd0y4iaYlL3MpROmsk="; }; extraInstallCommands = diff --git a/nixpkgs/pkgs/applications/audio/clerk/default.nix b/nixpkgs/pkgs/applications/audio/clerk/default.nix index 11f93e00b233..fa306d44c0a6 100644 --- a/nixpkgs/pkgs/applications/audio/clerk/default.nix +++ b/nixpkgs/pkgs/applications/audio/clerk/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "clerk"; - version = "unstable-2023-01-14"; + version = "unstable-2023-10-07"; src = fetchFromGitHub { owner = "carnager"; repo = "clerk"; - rev = "90c0e702fc4f8b65f0ced7b8944c063629e3686d"; - hash = "sha256-nkm1vJaWgN8gOkmAbsjPfstax8TwUSkEzYKJ1iEz1hM"; + rev = "907138d8fc2b1709fb49d062d0b663a48eb210bd"; + hash = "sha256-V2nDLq2ViC5Twve0EILBEYOdEavqgYB/TQq/T+ftfmk="; }; postPatch = '' @@ -77,5 +77,6 @@ stdenv.mkDerivation { license = licenses.mit; maintainers = with maintainers; [ anderspapitto rewine ]; mainProgram = "clerk"; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/cyanrip/default.nix b/nixpkgs/pkgs/applications/audio/cyanrip/default.nix deleted file mode 100644 index 1828858b3cdb..000000000000 --- a/nixpkgs/pkgs/applications/audio/cyanrip/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, ffmpeg-headless -, libcdio -, libcdio-paranoia -, libmusicbrainz5 -, curl -}: -stdenv.mkDerivation rec { - pname = "cyanrip"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "cyanreg"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-gH/rWTRYX10Q2Y9oSaMu0bOy3SMbcSNmH3dkXHFAw90"; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ ffmpeg-headless libcdio libcdio-paranoia libmusicbrainz5 curl ]; - - meta = with lib; { - homepage = "https://github.com/cyanreg/cyanrip"; - description = "Bule-ish CD ripper"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - maintainers = [ maintainers.zane ]; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/ekho/default.nix b/nixpkgs/pkgs/applications/audio/ekho/default.nix index 25ed8a71aa1d..c0cde8aaf9a1 100644 --- a/nixpkgs/pkgs/applications/audio/ekho/default.nix +++ b/nixpkgs/pkgs/applications/audio/ekho/default.nix @@ -1,16 +1,46 @@ -{ lib, stdenv, fetchurl, pkg-config -, libsndfile, libpulseaudio +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoconf +, automake +, libtool +, libsndfile +, libpulseaudio +, espeak-ng +, sonic +, utf8cpp +, AudioUnit }: -let - version = "5.8.2"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ekho"; - inherit version; + version = "9.0"; + + src = fetchFromGitHub { + owner = "hgneng"; + repo = "ekho"; + rev = "v${version}"; + hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk="; + }; + + preConfigure = '' + ./autogen.sh + ''; + + CXXFLAGS = [ + "-O0" + "-I${lib.getDev utf8cpp}/include/utf8cpp" + ]; + + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; + + buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit ]; meta = with lib; { description = "Chinese text-to-speech software"; - homepage = "http://www.eguidedog.net/ekho.php"; + homepage = "http://www.eguidedog.net/ekho.php"; longDescription = '' Ekho (余音) is a free, open source and multilingual text-to-speech (TTS) software. It supports Cantonese (Chinese dialect spoken in Hong Kong and @@ -18,22 +48,8 @@ in stdenv.mkDerivation rec { (a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before Yuan Dynasty) and Korean (in trial). ''; - license = licenses.gpl2Plus; - platforms = platforms.linux; - hydraPlatforms = []; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aaronjheng ]; }; - - src = fetchurl { - url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; - }; - - preConfigure = with lib; '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${optionalString stdenv.is64bit "-D_x86_64"}" - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\"" - ''; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix b/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix index 707deeb1a013..003936d74df3 100644 --- a/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix +++ b/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix @@ -22,7 +22,8 @@ let pname = "HybridReverb2"; - version = "2.1.2"; + version = "2.1.2-unstable-2021-12-19"; + rev = "2fc44c419f90133b3fcde71820212b5f281a0ad2"; owner = "jpcima"; DBversion = "1.0.0"; in @@ -40,8 +41,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { inherit owner; repo = pname; - rev = "v${version}"; - sha256 = "16r20plz1w068bgbkrydv01a991ygjybdya3ah7bhp3m5xafjwqb"; + rev = rev; + hash = "sha256-+uwTKHQ3nIWKbBCPtf/axvyW6MU0gemVtd2ZqqiT/w0="; fetchSubmodules = true; }; @@ -69,6 +70,8 @@ stdenv.mkDerivation rec { "-DHybridReverb2_UseLocalDatabase=ON" ]; + enableParallelBuilding = true; + postInstall = '' mkdir -p $out/share/${pname}/ cp -r ${impulseDB}/* $out/share/${pname}/ diff --git a/nixpkgs/pkgs/applications/audio/ledfx/default.nix b/nixpkgs/pkgs/applications/audio/ledfx/default.nix index d0cafaaf7f02..31e7d23f75df 100644 --- a/nixpkgs/pkgs/applications/audio/ledfx/default.nix +++ b/nixpkgs/pkgs/applications/audio/ledfx/default.nix @@ -5,21 +5,25 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.78"; - format = "setuptools"; + version = "2.0.80"; + pyproject= true; src = fetchPypi { inherit pname version; - hash = "sha256-IalfA/nfQrnE90ycOnPEZ4A/L8rwi08ECNA/8YxeAgQ="; + hash = "sha256-vwLk3EpXqUSAwzY2oX0ZpXrmH2cT0GdYdL/Mifav6mU="; }; postPatch = '' substituteInPlace setup.py \ --replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \ - --replace '"sentry-sdk==1.14.0",' "" \ + --replace '"sentry-sdk==1.14.0",' "sentry-sdk" \ --replace "~=" ">=" ''; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-cors @@ -36,6 +40,8 @@ python3.pkgs.buildPythonPackage rec { psutil pyserial pystray + python-mbedtls + python-osc python-rtmidi # rpi-ws281x # not packaged requests diff --git a/nixpkgs/pkgs/applications/audio/mmlgui/default.nix b/nixpkgs/pkgs/applications/audio/mmlgui/default.nix index 4959a567c417..d31ece0187d3 100644 --- a/nixpkgs/pkgs/applications/audio/mmlgui/default.nix +++ b/nixpkgs/pkgs/applications/audio/mmlgui/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "mmlgui"; - version = "unstable-2023-09-20"; + version = "unstable-2023-11-16"; src = fetchFromGitHub { owner = "superctr"; repo = "mmlgui"; - rev = "a941dbcb34d2e1d56ac4489fbec5f893e9b8fb6d"; + rev = "627bfc7b67d4d87253517ba71df2d699a8acdd10"; fetchSubmodules = true; - hash = "sha256-d5DznY0WRJpiUEtUQ8Yihc0Ej8+k5cYTqrzUSp/1wg4="; + hash = "sha256-d/QLRlSfCrrcvzIhwEBKB5chK+XqO/R8xJ5VfagDi4U="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index 6165e2c6181a..f634539a9f61 100644 --- a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.26"; + version = "10.28"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - sha256 = "sha256-SXuuAavvqzZ7DRX6SKfPfC1smbTHVHUAv80w0RHLfpg="; + sha256 = "sha256-9EFZvD3CicT68hBcc/fS73zonQKDwbV/iNY0CbBmhtE="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/mousai/default.nix b/nixpkgs/pkgs/applications/audio/mousai/default.nix index fae165495e19..c2bcc0200fbc 100644 --- a/nixpkgs/pkgs/applications/audio/mousai/default.nix +++ b/nixpkgs/pkgs/applications/audio/mousai/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "mousai"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - hash = "sha256-4olJGpS5QfPyt6/ZmigoojP7kGjx6LExW3LKrL4nxTE="; + hash = "sha256-QInnKjGYaWlIj+F3upQ8CJ6RqCM72Y+BGrrezndqfOg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SeKcguCB+f2ocKKf7Moc74O2sGK2EXgEEkTiN82dSps="; + hash = "sha256-/AwTNuDdhAhj/kbc6EdC3FKGO1LfZIY68utPjcrw0S0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/mus/default.nix b/nixpkgs/pkgs/applications/audio/mus/default.nix deleted file mode 100644 index 1235486ab554..000000000000 --- a/nixpkgs/pkgs/applications/audio/mus/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromSourcehut, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "mus"; - version = "0.2.0"; - - src = fetchFromSourcehut { - owner = "~sfr"; - repo = pname; - rev = version; - hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs="; - }; - - cargoHash = "sha256-K9B8y9pOHcAOrUCmCB0zW2wy81DTF3K97gPYmAiKwAM="; - - meta = with lib; { - description = "a pretty good mpd client"; - homepage = "https://sr.ht/~sfr/mus"; - license = licenses.mit; - maintainers = with maintainers; [ sfr ]; - mainProgram = "mus"; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/muzika/default.nix b/nixpkgs/pkgs/applications/audio/muzika/default.nix index 01f09a5bef92..6605ebc9dcca 100644 --- a/nixpkgs/pkgs/applications/audio/muzika/default.nix +++ b/nixpkgs/pkgs/applications/audio/muzika/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils , fetchFromGitHub , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , gjs , glib-networking , gobject-introspection @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook4 yarn + prefetch-yarn-deps ]; buildInputs = [ @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { preConfigure = '' export HOME="$PWD" yarn config --offline set yarn-offline-mirror $yarnOfflineCache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock ''; mesonFlags = [ diff --git a/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix index e88ce8c9e339..9577d8ab3959 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://rybczak.net/ncmpcpp/"; changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jfrankenau koral lovek323 ]; + maintainers = with maintainers; [ koral lovek323 ]; platforms = platforms.all; mainProgram = "ncmpcpp"; }; diff --git a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix index 91e043a59346..e0d284bc951e 100644 --- a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix +++ b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.5"; + version = "1.25.6"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-N0bL/kgw5tIVcD4fGYrahdola/w9ouct0+AUqw+dUOg="; + hash = "sha256-ZjNnchI8W0Xeuz1DHf3Q0cIL97BFXb3zY/HWQnrqqnk="; }; # Remove some Electron stuff from package.json @@ -16,7 +16,7 @@ buildNpmPackage rec { sed -i -e '/"electron"\|"electron-installer-debian"/d' package.json ''; - npmDepsHash = "sha256-unjoBWVwmUqxAU3mDC37sXzoh7aEOdny4Asa70+sZnk="; + npmDepsHash = "sha256-UqjYNXdNoQmirIgU9DRgkp14SIrawfrfi9mD2h6ACyU="; nativeBuildInputs = [ copyDesktopItems diff --git a/nixpkgs/pkgs/applications/audio/pianotrans/default.nix b/nixpkgs/pkgs/applications/audio/pianotrans/default.nix deleted file mode 100644 index e5848de03dac..000000000000 --- a/nixpkgs/pkgs/applications/audio/pianotrans/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, ffmpeg -}: - -python3.pkgs.buildPythonApplication rec { - pname = "pianotrans"; - version = "1.0.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "azuwis"; - repo = pname; - rev = "v${version}"; - hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - piano-transcription-inference - torch - tkinter - ]; - - # Project has no tests - doCheck = false; - - makeWrapperArgs = [ - ''--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}"'' - ]; - - meta = with lib; { - description = "Simple GUI for ByteDance's Piano Transcription with Pedals"; - homepage = "https://github.com/azuwis/pianotrans"; - license = licenses.mit; - maintainers = with maintainers; [ azuwis ]; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index dcbb7586eebe..01ccc65d5f63 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -105,6 +105,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer viraptor ]; + maintainers = with maintainers; [ ilian orivej uniquepointer viraptor ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix index f82043c8dc5b..fd0d0f3971f2 100644 --- a/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "23.8"; + version = "23.9"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-g2+7i1+TgX17TpW1mHSdAzHKC/Gtm4NYZCmuVoPo2rg="; + sha256 = "sha256-2iuY0kjLEVKTK4N1s+mBEt7+RlbK4rm6RFpWq08i6RY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/sonobus/default.nix b/nixpkgs/pkgs/applications/audio/sonobus/default.nix index da82fcc5a86e..f9b71a03623e 100644 --- a/nixpkgs/pkgs/applications/audio/sonobus/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonobus/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "sonobus"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "sonosaurus"; repo = "sonobus"; rev = version; - sha256 = "sha256-/Pb+PYmoCYA6Qcy/tR1Ejyt+rZ3pfJeWV4j7bQWYE58="; + sha256 = "sha256-zOPQK5X1E6t53DOjV7qSelyep4+m9aL4tRHqwyeuFQA="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/nixpkgs/pkgs/applications/audio/touchosc/default.nix index 3d6917b58dfe..f95c3616da8c 100644 --- a/nixpkgs/pkgs/applications/audio/touchosc/default.nix +++ b/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.4.180"; + version = "1.2.5.183"; 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-Z3vHcfimchshFTRbSsVhAw4DJPetZF59zyAnnbQ3YAM="; - armv7l-linux = "sha256-KUA6UFenEVme0AMuE69dR13RfYSGAd9GEdikh3DS0ko="; - x86_64-linux = "sha256-3RA+piRJ4UE4tPYALaifENJg7+0BZDmSwS36VJiEn8Q="; + aarch64-linux = "sha256-V5615E2jVqk7CcCBbW5A0JEyEi6secC0Rj8KrQpfjns="; + armv7l-linux = "sha256-0nyRffx8/OieVJTvJRtUIvrx5IyqmqEMMEZszPPDXb0="; + x86_64-linux = "sha256-oV2T7l5/3JqXXoyiR3PeYJyHQe4GcDUxsi6cNxLUcng="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/nixpkgs/pkgs/applications/backup/deja-dup/default.nix b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix index c2212373e70f..da97e45b63f6 100644 --- a/nixpkgs/pkgs/applications/backup/deja-dup/default.nix +++ b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; + mainProgram = "deja-dup"; }; } diff --git a/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/nixpkgs/pkgs/applications/backup/ludusavi/default.nix index f6abbf346c6d..f83f16a4e456 100644 --- a/nixpkgs/pkgs/applications/backup/ludusavi/default.nix +++ b/nixpkgs/pkgs/applications/backup/ludusavi/default.nix @@ -83,5 +83,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/mtkennerly/ludusavi/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ pasqui23 ]; + mainProgram = "ludusavi"; }; } diff --git a/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix b/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix index 6c571527248d..9065f7f486c0 100644 --- a/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix +++ b/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.upi.li/networkException/restic-integrity"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ janik ]; + mainProgram = "restic-integrity"; }; } diff --git a/nixpkgs/pkgs/applications/backup/restique/default.nix b/nixpkgs/pkgs/applications/backup/restique/default.nix index 6bc2ea8caf94..b7038d5a3d6e 100644 --- a/nixpkgs/pkgs/applications/backup/restique/default.nix +++ b/nixpkgs/pkgs/applications/backup/restique/default.nix @@ -39,5 +39,6 @@ mkDerivation rec { homepage = "https://git.srcbox.net/stefan/restique"; license = with licenses; [ gpl3Plus cc-by-sa-40 cc0 ]; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "restique"; }; } diff --git a/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix b/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix index 0527926addc7..2f164adcea12 100644 --- a/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.10.1"; + version = "0.10.2"; format = "pyproject"; @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "ep1cman"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5SarQw4xvLzL2JyBOqv5AtMAk3T4IHJN7fwk+OmujLM="; + hash = "sha256-EQCI7TkkOhDASMo5yKfAca/gB4ayyPOaDVK6WEaAIgc="; }; pythonRelaxDeps = [ @@ -50,5 +50,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ajs124 ]; + mainProgram = "unifi-protect-backup"; }; } diff --git a/nixpkgs/pkgs/applications/backup/vorta/default.nix b/nixpkgs/pkgs/applications/backup/vorta/default.nix index 7870b3c11ee6..6ce761e8677f 100644 --- a/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -95,5 +95,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; + mainProgram = "vorta"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/alfis/default.nix b/nixpkgs/pkgs/applications/blockchains/alfis/default.nix index cef4af1d77a0..af1da19f6386 100644 --- a/nixpkgs/pkgs/applications/blockchains/alfis/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/alfis/default.nix @@ -57,5 +57,6 @@ rustPlatform.buildRustPackage rec { license = licenses.agpl3Only; maintainers = with maintainers; [ misuzu ]; platforms = platforms.unix; + mainProgram = "alfis"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/aperture/default.nix b/nixpkgs/pkgs/applications/blockchains/aperture/default.nix index e208666bfe2c..c453d48c567a 100644 --- a/nixpkgs/pkgs/applications/blockchains/aperture/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/aperture/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/lightninglabs/aperture"; license = licenses.mit; maintainers = with maintainers; [ sputn1ck ]; + mainProgram = "aperture"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/nixpkgs/pkgs/applications/blockchains/besu/default.nix index 549437313bb4..bf1e4ced669a 100644 --- a/nixpkgs/pkgs/applications/blockchains/besu/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "23.10.0"; + version = "23.10.2"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-PHXzeSv9sIknBbN48Li/wU72zs8div5xHY2Gh+1mh88="; + sha256 = "sha256-JVgYpcYGejiqi1ZdjzKkmhcqdTah03BnO7t19UgmPCw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix b/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix index 9560292e1b7e..8e6881f0d7e8 100644 --- a/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -13,6 +13,7 @@ , tor , zip , xz +, findutils }: let @@ -24,7 +25,9 @@ let # whereas Nix only scans for hashes in uncompressed text. # ${bisq-tor} - JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ${args}" bisq-desktop-wrapped "$@" + classpath=@out@/lib/desktop.jar:@out@/lib/* + + exec "${openjdk11}/bin/java" -Djpackage.app-version=@version@ -XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication -Djava.net.preferIPv4Stack=true -classpath $classpath ${args} bisq.desktop.app.BisqAppMain "$@" ''; bisq-tor = writeScript "bisq-tor" '' @@ -35,11 +38,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.12"; + version = "1.9.14"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0zzrl7dmd3m7pymwvl68gnjspbpzf1w17bcwr0ipgsszmr35k9rs"; + sha256 = "0xbq94qbp59523xjp80bly38aisfwkfi0y9hmyhf8xlw084b82kz"; }; nativeBuildInputs = [ @@ -50,6 +53,7 @@ stdenv.mkDerivation rec { strip-nondeterminism xz zip + findutils ]; desktopItems = [ @@ -83,24 +87,22 @@ stdenv.mkDerivation rec { mkdir -p native/linux/x64/ cp ${bisq-tor} ./tor tar --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cJf native/linux/x64/tor.tar.xz tor - zip -r opt/bisq/lib/app/desktop-${version}-all.jar native - strip-nondeterminism opt/bisq/lib/app/desktop-${version}-all.jar + tor_jar_file=$(find ./opt/bisq/lib/app -name "tor-binary-linux64-*.jar") + zip -r $tor_jar_file native + strip-nondeterminism ./opt/bisq/lib/app/*.jar ''; installPhase = '' runHook preInstall - mkdir -p $out/lib $out/bin - cp opt/bisq/lib/app/desktop-${version}-all.jar $out/lib - - makeWrapper ${openjdk11}/bin/java $out/bin/bisq-desktop-wrapped \ - --add-flags "-jar $out/lib/desktop-${version}-all.jar bisq.desktop.app.BisqAppMain" + mkdir -p $out $out/bin + cp -r opt/bisq/lib/app $out/lib - makeWrapper ${bisq-launcher ""} $out/bin/bisq-desktop \ - --prefix PATH : $out/bin + install -D -m 777 ${bisq-launcher ""} $out/bin/bisq-desktop + substituteAllInPlace $out/bin/bisq-desktop - makeWrapper ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi \ - --prefix PATH : $out/bin + install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi + substituteAllInPlace $out/bin/bisq-desktop-hidpi for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n diff --git a/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix b/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix index 521a44de1dd0..1ea8912a7535 100644 --- a/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix @@ -35,5 +35,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/accumulator/charge-lnd"; license = licenses.gpl2Plus; maintainers = with maintainers; [ mmilata mariaa144 ]; + mainProgram = "charge-lnd"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix b/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix deleted file mode 100644 index 287a711d2348..000000000000 --- a/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, fetchFromGitHub -, substituteAll -, python3Packages -, chia -, -}: -python3Packages.buildPythonApplication rec { - pname = "chia-dev-tools"; - version = "1.1.5"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qWWLQ+SkoRu5cLytwwrslqsKORy+4ebO8brULEFGaF0="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit chia; - }) - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "==" ">=" - ''; - - nativeBuildInputs = [ - python3Packages.setuptools-scm - ]; - - # give a hint to setuptools-scm on package version - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - - propagatedBuildInputs = with python3Packages; [ - anyio - (toPythonModule chia) - pytest # required at runtime by the "test" command - pytest-asyncio - pytimeparse - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - postCheck = "unset HOME"; - - disabledTests = [ - "test_spendbundles" - ]; - - meta = with lib; { - homepage = "https://www.chia.net/"; - description = "Utility for developing in the Chia ecosystem: Chialisp functions, object inspection, RPC client and more"; - license = with licenses; [ asl20 ]; - maintainers = teams.chia.members; - }; -} diff --git a/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch b/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch deleted file mode 100644 index 9fb8fefe197a..000000000000 --- a/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cdv/cmds/sim_utils.py b/cdv/cmds/sim_utils.py -index e59ba8f..20912ff 100644 ---- a/cdv/cmds/sim_utils.py -+++ b/cdv/cmds/sim_utils.py -@@ -67,7 +67,7 @@ async def start_async(root_path: Path, group: Any, restart: bool) -> None: - - from chia.cmds.start_funcs import async_start - -- sys.argv[0] = str(Path(sys.executable).parent / "chia") # this gives the correct path to the chia executable -+ sys.argv[0] = "@chia@/bin/chia" # this gives the correct path to the chia executable - if root_path.exists(): - config = load_config(root_path, "config.yaml") - await async_start(root_path, config, group, restart) diff --git a/nixpkgs/pkgs/applications/blockchains/chia-plotter/default.nix b/nixpkgs/pkgs/applications/blockchains/chia-plotter/default.nix deleted file mode 100644 index 25d4d8653466..000000000000 --- a/nixpkgs/pkgs/applications/blockchains/chia-plotter/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenv -, libsodium -, cmake -, substituteAll -, python3Packages -}: - -stdenv.mkDerivation { - pname = "chia-plotter"; - version = "1.1.8"; - - src = fetchFromGitHub { - owner = "madMAx43v3r"; - repo = "chia-plotter"; - rev = "9d7fd929919d1adde6404cb4718a665a81bcef6d"; - sha256 = "sha256-TMAly+Qof2DHPRHqE1nZuHQaCeMo0jEd8MWy4OlXrcs="; - fetchSubmodules = true; - }; - - patches = [ - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./dont_fetch_dependencies.patch; - pybind11_src = python3Packages.pybind11.src; - relic_src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "relic"; - rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; - hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU="; - }; - sodium_src = fetchFromGitHub { - owner = "AmineKhaldi"; - repo = "libsodium-cmake"; - rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by upstream - sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; - fetchSubmodules = true; - }; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libsodium ]; - - # These flags come from the upstream build script: - # https://github.com/madMAx43v3r/chia-plotter/blob/974d6e5f1440f68c48492122ca33828a98864dfc/make_devel.sh#L7 - CXXFLAGS = "-O3 -fmax-errors=1"; - cmakeFlags = [ - "-DARITH=easy" - "-DBUILD_BLS_PYTHON_BINDINGS=false" - "-DBUILD_BLS_TESTS=false" - "-DBUILD_BLS_BENCHMARKS=false" - ]; - - installPhase = '' - runHook preInstall - - install -D -m 755 chia_plot $out/bin/chia_plot - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/madMAx43v3r/chia-plotter"; - description = "New implementation of a chia plotter which is designed as a processing pipeline"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ ilyakooo0 ]; - }; -} diff --git a/nixpkgs/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/nixpkgs/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch deleted file mode 100644 index b7474af4c963..000000000000 --- a/nixpkgs/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/lib/bls-signatures/python-bindings/CMakeLists.txt b/lib/bls-signatures/python-bindings/CMakeLists.txt -index 255e3bb..5f99c3a 100644 ---- a/lib/bls-signatures/python-bindings/CMakeLists.txt -+++ b/lib/bls-signatures/python-bindings/CMakeLists.txt -@@ -6,8 +6,7 @@ include(FetchContent) - - FetchContent_Declare( - pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 -+ SOURCE_DIR @pybind11_src@ - ) - FetchContent_MakeAvailable(pybind11 relic) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6922167..23d8da6 100644 ---- a/lib/bls-signatures/CMakeLists.txt -+++ b/lib/bls-signatures/CMakeLists.txt -@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH - include(FetchContent) - - FetchContent_Declare(Sodium -- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git -- # Latest commit at the moment this was added here -- # Anchored to libsodium v1.0.18 -- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 -+ URL @sodium_src@ - ) - set(SODIUM_PCH "on" CACHE STRING "") - set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") - set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "") - FetchContent_MakeAvailable(Sodium) - --if (DEFINED ENV{RELIC_MAIN}) -- set(RELIC_GIT_TAG "origin/main") --else () -- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 -- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7") --endif () -- - message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") - - FetchContent_Declare( - relic -- GIT_REPOSITORY https://github.com/Chia-Network/relic.git -- GIT_TAG ${RELIC_GIT_TAG} -+ SOURCE_DIR @relic_src@ - ) - - # Relic related options - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 970ec74..948441a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,6 +38,7 @@ include_directories( - ${BLAKE3_PATH} - ${CMAKE_BINARY_DIR}/_deps/relic-src/include - ${CMAKE_BINARY_DIR}/_deps/relic-build/include -+ @relic_src@/include - ) - - IF (WIN32) diff --git a/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/nixpkgs/pkgs/applications/blockchains/chia/default.nix deleted file mode 100644 index a07a0ea1e281..000000000000 --- a/nixpkgs/pkgs/applications/blockchains/chia/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib -, cacert -, fetchFromGitHub -, python3Packages -}: - -let chia = python3Packages.buildPythonApplication rec { - pname = "chia"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "chia-blockchain"; - rev = version; - fetchSubmodules = true; - hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "==" ">=" - - cp ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem - ''; - - nativeBuildInputs = [ - python3Packages.setuptools-scm - ]; - - # give a hint to setuptools-scm on package version - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - - propagatedBuildInputs = with python3Packages; [ - aiofiles - aiohttp - aiosqlite - bitstring - blspy - chiapos - chiavdf - chiabip158 - chia-rs - click - clvm - clvm-rs - clvm-tools - clvm-tools-rs - colorama - colorlog - concurrent-log-handler - cryptography - dnslib - dnspython - fasteners - filelock - keyrings-cryptfile - psutil - pyyaml - setproctitle - setuptools # needs pkg_resources at runtime - sortedcontainers - watchdog - websockets - zstd - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - # Testsuite is expensive and non-deterministic, so it is available in - # passthru.tests instead. - doCheck = false; - - disabledTests = [ - "test_spend_through_n" - "test_spend_zero_coin" - "test_default_cached_master_passphrase" - "test_using_legacy_keyring" - ]; - - preCheck = '' - export HOME=`mktemp -d` - ''; - - passthru.tests = { - chiaWithTests = chia.overrideAttrs (_: { doCheck = true; }); - }; - - meta = with lib; { - homepage = "https://www.chia.net/"; - description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure."; - license = with licenses; [ asl20 ]; - maintainers = teams.chia.members; - platforms = platforms.all; - }; -}; -in chia diff --git a/nixpkgs/pkgs/applications/blockchains/clboss/default.nix b/nixpkgs/pkgs/applications/blockchains/clboss/default.nix index c6ffe8e07f98..c016e0f37e38 100644 --- a/nixpkgs/pkgs/applications/blockchains/clboss/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/clboss/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ prusnak ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "clboss"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/nixpkgs/pkgs/applications/blockchains/clightning/default.nix index 0efa0c0652ea..d4fa4c68fe26 100644 --- a/nixpkgs/pkgs/applications/blockchains/clightning/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "23.08.1"; + version = "23.11"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-Pongzgr+VMrp8nrpnR0QCarMWUBPPjTdoebvpWrSy6w="; + sha256 = "sha256:1q1plg9qhwlrcvljnrv8yd1gaz9a98pxgql7bqxjq37vk3lfggw6"; }; # when building on darwin we need dawin.cctools to provide the correct libtool @@ -51,12 +51,17 @@ stdenv.mkDerivation rec { substituteInPlace external/libwally-core/configure.ac --replace gsed sed ''; - configureFlags = [ "--disable-developer" "--disable-valgrind" ]; + configureFlags = [ "--disable-valgrind" ]; makeFlags = [ "VERSION=v${version}" ]; enableParallelBuilding = true; + # workaround for build issue, happens only x86_64-darwin, not aarch64-darwin + # ccan/ccan/fdpass/fdpass.c:16:8: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant] + # char buf[CMSG_SPACE(sizeof(fd))]; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-Wno-error=gnu-folding-constant"; + meta = with lib; { description = "A Bitcoin Lightning Network implementation in C"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix index e45e43497563..1460d87d932b 100644 --- a/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix @@ -29,5 +29,6 @@ in appimageTools.wrapType2 rec { license = licenses.asl20; maintainers = with maintainers; [ th0rgal ]; platforms = [ "x86_64-linux" ]; + mainProgram = "chain-desktop-wallet"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix b/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix index d93a10436fc3..588fb03a3656 100644 --- a/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix @@ -19,5 +19,6 @@ buildPythonApplication rec { description = "Command line Cryptocurrency Portfolio"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bhipple ]; + mainProgram = "cryptop"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix b/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix index 97f9b7767db7..04411399ac34 100644 --- a/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "A secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; maintainers = with lib.maintainers; [ ]; + mainProgram = "dcrctl"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix b/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix index da1755f14b5b..fa604e9aac93 100644 --- a/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "A secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; maintainers = with lib.maintainers; [ juaningan ]; + mainProgram = "dcrwallet"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/electrs/default.nix b/nixpkgs/pkgs/applications/blockchains/electrs/default.nix index 40dfe70debd3..2401231367ef 100644 --- a/nixpkgs/pkgs/applications/blockchains/electrs/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/electrs/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/romanz/electrs"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; + mainProgram = "electrs"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 7ff9b9563d90..d630ce55383c 100644 --- a/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.cc0; platforms = platforms.all; maintainers = with maintainers; [ mmahut ]; + mainProgram = "ergo"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix b/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix index eea4d546f14b..50fa8fee0668 100644 --- a/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-ethereum/ethabi"; maintainers = [ maintainers.dbrock ]; license = licenses.asl20; + mainProgram = "ethabi"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix b/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix index 586431bd4634..d4877fc6ca85 100644 --- a/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.9.3"; + version = "1.9.7"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-hSunoltau1eG0DDM/bxZ/ssxd7pbutNC34Nwtbu9Fqk="; + sha256 = "sha256-EslrlnMgH6W/0q/P4H/o6n3zbBDNIGuNAFyGWcZBYL4="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 8ba06230bb27..5f96baba174b 100644 --- a/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -33,5 +33,6 @@ appimageTools.wrapType2 rec { license = licenses.mit; maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ledger-live-desktop"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix b/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix index 2500ec5c2857..dbc4d4d4b9aa 100644 --- a/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix @@ -152,5 +152,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://lighthouse.sigmaprime.io/"; license = licenses.asl20; maintainers = with maintainers; [ centromere pmw ]; + mainProgram = "lighthouse"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix b/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix index 040d08e752b6..5b89ec20091a 100644 --- a/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix @@ -38,5 +38,6 @@ buildGoModule rec { homepage = "https://github.com/zcash/lightwalletd"; maintainers = with maintainers; [ centromere ]; license = licenses.mit; + mainProgram = "lightwalletd"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix b/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix index 860ca5a1bd6a..c773ce8e193f 100644 --- a/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/LN-Zap/lndconnect"; maintainers = [ maintainers.d-xo ]; platforms = platforms.linux; + mainProgram = "lndconnect"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix b/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix index 08bfd05471d4..b236ed5da442 100644 --- a/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/getAlby/lndhub.go"; license = licenses.gpl3; maintainers = with maintainers; [ prusnak ]; + mainProgram = "lndhub.go"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix b/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix index 97333fde00dd..6a76ff9530c6 100644 --- a/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix @@ -40,5 +40,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/bitromortac/lndmanage"; license = licenses.mit; maintainers = with maintainers; [ mmilata ]; + mainProgram = "lndmanage"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix b/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix index e9d68b756212..acdcd108c607 100644 --- a/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ RaghavSood jb55 ]; + mainProgram = "miniscript"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix b/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix index d4793eb9276b..fada1835bfb1 100644 --- a/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix @@ -50,5 +50,6 @@ in appimageTools.wrapType2 rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ ]; + mainProgram = "MyCrypto"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 6de7cf7578c4..a2e7b0241baf 100644 --- a/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -30,5 +30,6 @@ buildDotnetModule rec { maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "nbxplorer"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix b/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix index 43b24ecd61a1..a41b9df83751 100644 --- a/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix @@ -57,5 +57,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ akru ]; platforms = lib.platforms.unix; + mainProgram = "openethereum"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/optimism/default.nix b/nixpkgs/pkgs/applications/blockchains/optimism/default.nix index 2cbcaf532afe..cd7cc1ce9fe2 100644 --- a/nixpkgs/pkgs/applications/blockchains/optimism/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/optimism/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/ethereum-optimism/optimism"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; + mainProgram = "cmd"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock index a2b4766cfe59..a171500577be 100644 --- a/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -328,6 +328,18 @@ dependencies = [ ] [[package]] +name = "ark-bls12-377-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-models-ext", + "ark-std", +] + +[[package]] name = "ark-bls12-381" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -340,6 +352,20 @@ dependencies = [ ] [[package]] +name = "ark-bls12-381-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-models-ext", + "ark-serialize", + "ark-std", +] + +[[package]] name = "ark-bw6-761" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -352,6 +378,19 @@ dependencies = [ ] [[package]] +name = "ark-bw6-761-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2" +dependencies = [ + "ark-bw6-761", + "ark-ec", + "ark-ff", + "ark-models-ext", + "ark-std", +] + +[[package]] name = "ark-ec" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -365,6 +404,7 @@ dependencies = [ "hashbrown 0.13.2", "itertools 0.10.5", "num-traits", + "rayon", "zeroize", ] @@ -381,6 +421,19 @@ dependencies = [ ] [[package]] +name = "ark-ed-on-bls12-377-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ff", + "ark-models-ext", + "ark-std", +] + +[[package]] name = "ark-ed-on-bls12-381-bandersnatch" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -393,6 +446,19 @@ dependencies = [ ] [[package]] +name = "ark-ed-on-bls12-381-bandersnatch-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-models-ext", + "ark-std", +] + +[[package]] name = "ark-ff" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -436,6 +502,19 @@ dependencies = [ ] [[package]] +name = "ark-models-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", +] + +[[package]] name = "ark-poly" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -465,7 +544,7 @@ dependencies = [ [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" dependencies = [ "ark-ec", "ark-ff", @@ -508,12 +587,13 @@ checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", "rand 0.8.5", + "rayon", ] [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" dependencies = [ "ark-ff", "ark-serialize", @@ -575,7 +655,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", + "time 0.3.27", ] [[package]] @@ -591,7 +671,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", + "time 0.3.27", ] [[package]] @@ -680,6 +760,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-multisig", "pallet-nft-fractionalization", "pallet-nfts", @@ -694,7 +775,6 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -712,11 +792,12 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -752,6 +833,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-multisig", "pallet-nfts", "pallet-nfts-runtime-api", @@ -764,7 +846,6 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -781,11 +862,12 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -793,29 +875,42 @@ dependencies = [ ] [[package]] +name = "asset-hub-rococo-emulated-chain" +version = "0.0.0" +dependencies = [ + "asset-hub-rococo-runtime", + "cumulus-primitives-core", + "emulated-integration-tests-common", + "frame-support", + "parachains-common", + "rococo-emulated-chain", + "serde_json", + "sp-core", + "sp-runtime", +] + +[[package]] name = "asset-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", "asset-hub-rococo-runtime", "asset-test-utils", + "emulated-integration-tests-common", "frame-support", - "frame-system", - "integration-tests-common", "pallet-asset-conversion", "pallet-assets", "pallet-balances", + "pallet-message-queue", "pallet-xcm", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-parachains", + "penpal-runtime", "rococo-runtime", + "rococo-system-emulated-network", "sp-runtime", "staging-xcm", "staging-xcm-executor", - "xcm-emulator", ] [[package]] @@ -825,9 +920,9 @@ dependencies = [ "asset-test-utils", "assets-common", "bp-asset-hub-rococo", - "bp-asset-hub-wococo", + "bp-asset-hub-westend", "bp-bridge-hub-rococo", - "bp-bridge-hub-wococo", + "bp-bridge-hub-westend", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -852,6 +947,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-multisig", "pallet-nft-fractionalization", "pallet-nfts", @@ -867,7 +963,6 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "pallet-xcm-bridge-hub-router", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -881,15 +976,17 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", "sp-weights", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -897,6 +994,21 @@ dependencies = [ ] [[package]] +name = "asset-hub-westend-emulated-chain" +version = "0.0.0" +dependencies = [ + "asset-hub-westend-runtime", + "cumulus-primitives-core", + "emulated-integration-tests-common", + "frame-support", + "parachains-common", + "serde_json", + "sp-core", + "sp-runtime", + "westend-emulated-chain", +] + +[[package]] name = "asset-hub-westend-integration-tests" version = "1.0.0" dependencies = [ @@ -905,28 +1017,26 @@ dependencies = [ "asset-test-utils", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", + "emulated-integration-tests-common", "frame-support", "frame-system", - "integration-tests-common", "pallet-asset-conversion", "pallet-asset-rate", "pallet-assets", "pallet-balances", + "pallet-message-queue", "pallet-treasury", "pallet-xcm", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", "polkadot-runtime-common", - "polkadot-runtime-parachains", "sp-runtime", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "westend-runtime", "westend-runtime-constants", - "xcm-emulator", + "westend-system-emulated-network", ] [[package]] @@ -935,6 +1045,10 @@ version = "0.9.420" dependencies = [ "asset-test-utils", "assets-common", + "bp-asset-hub-rococo", + "bp-asset-hub-westend", + "bp-bridge-hub-rococo", + "bp-bridge-hub-westend", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -959,6 +1073,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-multisig", "pallet-nft-fractionalization", "pallet-nfts", @@ -972,7 +1087,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", + "pallet-xcm-bridge-hub-router", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -987,14 +1102,14 @@ dependencies = [ "sp-core", "sp-genesis-builder", "sp-inherents", - "sp-io", "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1007,7 +1122,6 @@ name = "asset-test-utils" version = "1.0.0" dependencies = [ "assets-common", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", @@ -1022,7 +1136,6 @@ dependencies = [ "pallet-session", "pallet-xcm", "pallet-xcm-bridge-hub-router", - "parachain-info", "parachains-common", "parachains-runtimes-test-utils", "parity-scale-codec", @@ -1031,7 +1144,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1054,7 +1168,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1255,8 +1369,8 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" -version = "0.0.1" -source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +version = "0.0.3" +source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1271,6 +1385,8 @@ dependencies = [ "rand_core 0.6.4", "ring 0.1.0", "sha2 0.10.7", + "sp-ark-bls12-381", + "sp-ark-ed-on-bls12-381-bandersnatch", "zeroize", ] @@ -1377,6 +1493,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", + "rand 0.8.5", + "rand_core 0.6.4", + "serde", + "unicode-normalization", ] [[package]] @@ -1405,6 +1525,7 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", + "serde", "tap", "wyz", ] @@ -1568,27 +1689,6 @@ dependencies = [ ] [[package]] -name = "bp-asset-hub-kusama" -version = "0.1.0" -dependencies = [ - "bp-xcm-bridge-hub-router", - "frame-support", - "parity-scale-codec", - "scale-info", -] - -[[package]] -name = "bp-asset-hub-polkadot" -version = "0.1.0" -dependencies = [ - "bp-xcm-bridge-hub-router", - "frame-support", - "parity-scale-codec", - "scale-info", - "sp-runtime", -] - -[[package]] name = "bp-asset-hub-rococo" version = "0.1.0" dependencies = [ @@ -1599,7 +1699,7 @@ dependencies = [ ] [[package]] -name = "bp-asset-hub-wococo" +name = "bp-asset-hub-westend" version = "0.1.0" dependencies = [ "bp-xcm-bridge-hub-router", @@ -1619,7 +1719,7 @@ dependencies = [ "frame-system", "polkadot-primitives", "sp-api", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1632,7 +1732,7 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1645,7 +1745,7 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1658,11 +1758,11 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] -name = "bp-bridge-hub-wococo" +name = "bp-bridge-hub-westend" version = "0.1.0" dependencies = [ "bp-bridge-hub-cumulus", @@ -1671,7 +1771,7 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1690,7 +1790,7 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1702,7 +1802,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1718,7 +1818,7 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1734,7 +1834,7 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1746,7 +1846,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1763,7 +1863,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1781,7 +1881,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1796,7 +1896,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1808,7 +1908,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1829,7 +1929,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 8.0.0", "sp-trie", "trie-db", ] @@ -1849,21 +1949,20 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-trie", ] [[package]] -name = "bp-wococo" +name = "bp-westend" version = "0.1.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", - "bp-rococo", "bp-runtime", "frame-support", "sp-api", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -1902,6 +2001,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-multisig", "pallet-session", "pallet-timestamp", @@ -1910,7 +2010,6 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -1929,10 +2028,11 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1965,6 +2065,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-multisig", "pallet-session", "pallet-timestamp", @@ -1973,7 +2074,6 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -1992,10 +2092,11 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2003,6 +2104,20 @@ dependencies = [ ] [[package]] +name = "bridge-hub-rococo-emulated-chain" +version = "0.0.0" +dependencies = [ + "bridge-hub-rococo-runtime", + "cumulus-primitives-core", + "emulated-integration-tests-common", + "frame-support", + "parachains-common", + "serde_json", + "sp-core", + "sp-runtime", +] + +[[package]] name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ @@ -2011,18 +2126,18 @@ dependencies = [ "bridge-hub-rococo-runtime", "cumulus-pallet-dmp-queue", "cumulus-pallet-xcmp-queue", + "emulated-integration-tests-common", "frame-support", - "integration-tests-common", + "pallet-assets", + "pallet-balances", "pallet-bridge-messages", + "pallet-message-queue", "pallet-xcm", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-parachains", + "rococo-westend-system-emulated-network", "staging-xcm", "staging-xcm-executor", - "xcm-emulator", ] [[package]] @@ -2030,9 +2145,9 @@ name = "bridge-hub-rococo-runtime" version = "0.1.0" dependencies = [ "bp-asset-hub-rococo", - "bp-asset-hub-wococo", + "bp-asset-hub-westend", "bp-bridge-hub-rococo", - "bp-bridge-hub-wococo", + "bp-bridge-hub-westend", "bp-header-chain", "bp-messages", "bp-parachains", @@ -2040,7 +2155,7 @@ dependencies = [ "bp-relayers", "bp-rococo", "bp-runtime", - "bp-wococo", + "bp-westend", "bridge-hub-test-utils", "bridge-runtime-common", "cumulus-pallet-aura-ext", @@ -2068,6 +2183,7 @@ dependencies = [ "pallet-bridge-parachains", "pallet-bridge-relayers", "pallet-collator-selection", + "pallet-message-queue", "pallet-multisig", "pallet-session", "pallet-timestamp", @@ -2076,7 +2192,6 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -2097,10 +2212,11 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2113,8 +2229,6 @@ name = "bridge-hub-test-utils" version = "0.1.0" dependencies = [ "asset-test-utils", - "bp-bridge-hub-rococo", - "bp-bridge-hub-wococo", "bp-header-chain", "bp-messages", "bp-parachains", @@ -2123,7 +2237,6 @@ dependencies = [ "bp-runtime", "bp-test-utils", "bridge-runtime-common", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "frame-benchmarking", @@ -2141,7 +2254,6 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", - "parachain-info", "parachains-common", "parachains-runtimes-test-utils", "parity-scale-codec", @@ -2149,13 +2261,134 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", ] [[package]] +name = "bridge-hub-westend-emulated-chain" +version = "0.0.0" +dependencies = [ + "bridge-hub-westend-runtime", + "cumulus-primitives-core", + "emulated-integration-tests-common", + "frame-support", + "parachains-common", + "serde_json", + "sp-core", + "sp-runtime", +] + +[[package]] +name = "bridge-hub-westend-integration-tests" +version = "1.0.0" +dependencies = [ + "asset-test-utils", + "bp-messages", + "bridge-hub-westend-runtime", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-xcmp-queue", + "emulated-integration-tests-common", + "frame-support", + "pallet-assets", + "pallet-balances", + "pallet-bridge-messages", + "pallet-message-queue", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "rococo-westend-system-emulated-network", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "bridge-hub-westend-runtime" +version = "0.1.0" +dependencies = [ + "bp-asset-hub-westend", + "bp-bridge-hub-rococo", + "bp-bridge-hub-westend", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-rococo", + "bp-runtime", + "bp-westend", + "bridge-hub-test-utils", + "bridge-runtime-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-collator-selection", + "pallet-message-queue", + "pallet-multisig", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-transaction-pool", + "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", + "westend-runtime-constants", +] + +[[package]] name = "bridge-runtime-common" version = "0.1.0" dependencies = [ @@ -2184,7 +2417,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-trie", "staging-xcm", "staging-xcm-builder", @@ -2419,29 +2652,16 @@ dependencies = [ ] [[package]] -name = "chain-spec-builder" -version = "2.0.0" -dependencies = [ - "ansi_term", - "clap 4.4.6", - "node-cli", - "rand 0.8.5", - "sc-chain-spec", - "sc-keystore", - "sp-core", - "sp-keystore", -] - -[[package]] name = "chrono" -version = "0.4.30" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", + "time 0.1.45", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -2571,6 +2791,7 @@ dependencies = [ "anstyle", "clap_lex 0.5.1", "strsim", + "terminal_size", ] [[package]] @@ -2673,6 +2894,79 @@ dependencies = [ "pallet-collective", "pallet-collective-content", "pallet-core-fellowship", + "pallet-message-queue", + "pallet-multisig", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-referenda", + "pallet-salary", + "pallet-scheduler", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-arithmetic", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-transaction-pool", + "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "collectives-westend-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal", + "log", + "pallet-alliance", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-collective", + "pallet-collective-content", + "pallet-core-fellowship", + "pallet-message-queue", "pallet-multisig", "pallet-preimage", "pallet-proxy", @@ -2686,7 +2980,6 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -2705,14 +2998,17 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", + "testnets-common", + "westend-runtime-constants", ] [[package]] @@ -2889,6 +3185,7 @@ dependencies = [ "pallet-contracts", "pallet-contracts-primitives", "pallet-insecure-randomness-collective-flip", + "pallet-message-queue", "pallet-multisig", "pallet-session", "pallet-sudo", @@ -2897,7 +3194,6 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -2915,10 +3211,11 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -3364,7 +3661,7 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "sp-state-machine", - "sp-tracing", + "sp-tracing 10.0.0", "tracing", ] @@ -3435,7 +3732,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-timestamp", - "sp-tracing", + "sp-tracing 10.0.0", "sp-trie", "substrate-prometheus-endpoint", "tracing", @@ -3586,7 +3883,7 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -3594,6 +3891,7 @@ name = "cumulus-pallet-dmp-queue" version = "0.1.0" dependencies = [ "cumulus-primitives-core", + "frame-benchmarking", "frame-support", "frame-system", "log", @@ -3602,8 +3900,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-version", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "staging-xcm", ] @@ -3619,26 +3917,30 @@ dependencies = [ "cumulus-test-client", "cumulus-test-relay-sproof-builder", "environmental", + "frame-benchmarking", "frame-support", "frame-system", + "futures", "hex-literal", "impl-trait-for-tuples", "lazy_static", "log", + "pallet-message-queue", "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-runtime-parachains", + "rand 0.8.5", "sc-client-api", "scale-info", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-inherents", "sp-io", "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "sp-trie", "sp-version", "staging-xcm", @@ -3665,7 +3967,7 @@ dependencies = [ "pallet-session", "parity-scale-codec", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -3680,7 +3982,7 @@ dependencies = [ "polkadot-primitives", "scale-info", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -3694,7 +3996,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", ] @@ -3702,6 +4004,7 @@ dependencies = [ name = "cumulus-pallet-xcmp-queue" version = "0.1.0" dependencies = [ + "bounded-collections", "bp-xcm-bridge-hub-router", "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -3710,15 +4013,15 @@ dependencies = [ "frame-system", "log", "pallet-balances", + "pallet-message-queue", "parity-scale-codec", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rand_chacha 0.3.1", "scale-info", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -3735,7 +4038,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", ] @@ -3749,7 +4052,7 @@ dependencies = [ "sp-api", "sp-consensus-aura", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -3763,7 +4066,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-trie", "staging-xcm", ] @@ -3784,8 +4087,8 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-trie", "tracing", ] @@ -3798,7 +4101,7 @@ dependencies = [ "futures", "parity-scale-codec", "sp-inherents", - "sp-std", + "sp-std 8.0.0", "sp-timestamp", ] @@ -3815,7 +4118,7 @@ dependencies = [ "polkadot-runtime-parachains", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -3881,6 +4184,7 @@ dependencies = [ "polkadot-core-primitives", "polkadot-network-bridge", "polkadot-node-collation-generation", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-subsystem-util", @@ -3929,7 +4233,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-storage", + "sp-storage 13.0.0", "thiserror", "tokio", "tokio-util", @@ -3977,7 +4281,7 @@ dependencies = [ "polkadot-primitives", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 8.0.0", "sp-trie", ] @@ -3993,6 +4297,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "pallet-balances", "pallet-glutton", + "pallet-message-queue", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -4001,12 +4306,13 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -4067,6 +4373,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "serde", + "serde_json", "sp-api", "sp-arithmetic", "sp-authority-discovery", @@ -4079,7 +4386,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-test-client", "substrate-test-utils", "tempfile", @@ -4507,7 +4814,7 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6" +source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" dependencies = [ "ark-ec", "ark-ff", @@ -4538,18 +4845,18 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee528c501ddd15d5181997e9518e59024844eac44fd1e40cb20ddb2a8562fa" +checksum = "4235e9b248e2ba4b92007fe9c646f3adf0ffde16dc74713eacc92b8bc58d8d2f" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca01728ab2679c464242eca99f94e2ce0514b52ac9ad950e2ed03fca991231c" +checksum = "47020e12d7c7505670d1363dd53d6c23724f71a90a3ae32ff8eba40de8404626" dependencies = [ "common-path", "derive-syn-parse", @@ -4735,6 +5042,40 @@ dependencies = [ ] [[package]] +name = "emulated-integration-tests-common" +version = "1.0.0" +dependencies = [ + "asset-test-utils", + "bp-messages", + "bridge-runtime-common", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "frame-support", + "pallet-assets", + "pallet-balances", + "pallet-bridge-messages", + "pallet-im-online", + "pallet-message-queue", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "paste", + "polkadot-primitives", + "polkadot-runtime-parachains", + "polkadot-service", + "sc-consensus-grandpa", + "serde_json", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] name = "encode_unicode" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5192,10 +5533,32 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame" -version = "0.1.0" +version = "0.0.1-dev" dependencies = [ + "docify", + "frame-executive", "frame-support", "frame-system", + "frame-system-rpc-runtime-api", + "log", + "pallet-examples", + "parity-scale-codec", + "scale-info", + "simple-mermaid", + "sp-api", + "sp-arithmetic", + "sp-block-builder", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std 8.0.0", + "sp-transaction-pool", + "sp-version", ] [[package]] @@ -5219,9 +5582,9 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "static_assertions", ] @@ -5259,15 +5622,15 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-database", - "sp-externalities", + "sp-externalities 0.19.0", "sp-inherents", "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-storage", + "sp-storage 13.0.0", "sp-trie", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "thiserror", "thousands", ] @@ -5283,7 +5646,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -5317,7 +5680,7 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -5354,8 +5717,8 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "sp-version", ] @@ -5385,7 +5748,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-tracing", + "sp-tracing 10.0.0", "spinners", "substrate-rpc-client", "tokio", @@ -5420,7 +5783,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", - "sp-debug-derive", + "sp-debug-derive 8.0.0", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -5428,8 +5791,8 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "sp-weights", "static_assertions", "tt-call", @@ -5495,7 +5858,7 @@ dependencies = [ "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 8.0.0", "sp-version", "static_assertions", "trybuild", @@ -5547,10 +5910,10 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-version", "sp-weights", "substrate-test-runtime-client", @@ -5566,10 +5929,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-version", ] @@ -5589,7 +5952,7 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -5614,7 +5977,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.8", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -5901,9 +6264,54 @@ dependencies = [ "frame-try-runtime", "pallet-aura", "pallet-glutton", + "pallet-message-queue", + "pallet-sudo", + "pallet-timestamp", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-genesis-builder", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-transaction-pool", + "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "glutton-westend-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcm", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-timestamp", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "pallet-aura", + "pallet-glutton", + "pallet-message-queue", "pallet-sudo", "pallet-timestamp", - "parachain-info", "parachains-common", "parity-scale-codec", "scale-info", @@ -5916,10 +6324,11 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -6459,55 +6868,6 @@ dependencies = [ ] [[package]] -name = "integration-tests-common" -version = "1.0.0" -dependencies = [ - "asset-hub-kusama-runtime", - "asset-hub-polkadot-runtime", - "asset-hub-rococo-runtime", - "asset-hub-westend-runtime", - "bp-messages", - "bridge-hub-kusama-runtime", - "bridge-hub-polkadot-runtime", - "bridge-hub-rococo-runtime", - "bridge-runtime-common", - "collectives-polkadot-runtime", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "frame-support", - "pallet-assets", - "pallet-balances", - "pallet-bridge-messages", - "pallet-im-online", - "pallet-message-queue", - "pallet-staking", - "pallet-xcm", - "parachains-common", - "parity-scale-codec", - "paste", - "penpal-runtime", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-primitives", - "polkadot-runtime-parachains", - "polkadot-service", - "rococo-runtime", - "rococo-runtime-constants", - "sc-consensus-grandpa", - "sp-authority-discovery", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-runtime", - "staging-xcm", - "westend-runtime", - "westend-runtime-constants", - "xcm-emulator", -] - -[[package]] name = "interceptor" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6568,7 +6928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.8", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -6895,6 +7255,7 @@ dependencies = [ "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", + "pallet-skip-feeless-payment", "pallet-society", "pallet-staking", "pallet-staking-reward-curve", @@ -6916,6 +7277,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "scale-info", + "serde_json", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -6931,8 +7293,8 @@ dependencies = [ "sp-session", "sp-staking", "sp-statement-store", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", "static_assertions", @@ -7021,9 +7383,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libflate" @@ -7607,9 +7969,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lioness" @@ -7934,6 +8296,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] +name = "minimal-node" +version = "4.0.0-dev" +dependencies = [ + "clap 4.4.6", + "frame", + "futures", + "futures-timer", + "jsonrpsee", + "minimal-runtime", + "sc-basic-authorship", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-manual-seal", + "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-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-build-script-utils", + "substrate-frame-rpc-system", +] + +[[package]] +name = "minimal-runtime" +version = "0.1.0" +dependencies = [ + "frame", + "frame-support", + "pallet-balances", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "parity-scale-codec", + "scale-info", + "sp-genesis-builder", + "substrate-wasm-builder", +] + +[[package]] name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7996,7 +8410,7 @@ dependencies = [ "sp-core", "sp-mmr-primitives", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-test-runtime-client", "tokio", ] @@ -8270,6 +8684,17 @@ dependencies = [ ] [[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "libc", +] + +[[package]] name = "no-std-net" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8306,157 +8731,12 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-tracing", + "sp-tracing 10.0.0", "sp-trie", "tempfile", ] [[package]] -name = "node-cli" -version = "3.0.0-dev" -dependencies = [ - "array-bytes 6.1.0", - "assert_cmd", - "clap 4.4.6", - "clap_complete", - "criterion 0.4.0", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "futures", - "jsonrpsee", - "kitchensink-runtime", - "log", - "nix 0.26.2", - "node-executor", - "node-inspect", - "node-primitives", - "node-rpc", - "pallet-asset-conversion-tx-payment", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-balances", - "pallet-im-online", - "pallet-timestamp", - "parity-scale-codec", - "platforms", - "rand 0.8.5", - "regex", - "sc-authority-discovery", - "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-consensus-grandpa", - "sc-consensus-slots", - "sc-executor", - "sc-keystore", - "sc-mixnet", - "sc-network", - "sc-network-common", - "sc-network-statement", - "sc-network-sync", - "sc-offchain", - "sc-rpc", - "sc-service", - "sc-service-test", - "sc-statement-store", - "sc-storage-monitor", - "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", - "sc-transaction-pool-api", - "serde", - "serde_json", - "soketto", - "sp-api", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-keystore", - "sp-mixnet", - "sp-runtime", - "sp-statement-store", - "sp-timestamp", - "sp-tracing", - "sp-transaction-storage-proof", - "substrate-build-script-utils", - "substrate-cli-test-utils", - "substrate-frame-cli", - "substrate-rpc-client", - "tempfile", - "tokio", - "tokio-util", - "try-runtime-cli", - "wait-timeout", -] - -[[package]] -name = "node-executor" -version = "3.0.0-dev" -dependencies = [ - "criterion 0.4.0", - "frame-benchmarking", - "frame-support", - "frame-system", - "futures", - "kitchensink-runtime", - "node-primitives", - "node-testing", - "pallet-balances", - "pallet-contracts", - "pallet-glutton", - "pallet-im-online", - "pallet-root-testing", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-treasury", - "parity-scale-codec", - "sc-executor", - "scale-info", - "sp-application-crypto", - "sp-consensus-babe", - "sp-core", - "sp-externalities", - "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-statement-store", - "sp-tracing", - "sp-trie", - "wat", -] - -[[package]] -name = "node-inspect" -version = "0.9.0-dev" -dependencies = [ - "clap 4.4.6", - "parity-scale-codec", - "sc-cli", - "sc-client-api", - "sc-service", - "sp-blockchain", - "sp-core", - "sp-runtime", - "thiserror", -] - -[[package]] name = "node-primitives" version = "2.0.0" dependencies = [ @@ -8532,6 +8812,7 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-transaction-pool-api", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -8583,6 +8864,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "scale-info", + "serde_json", "sp-api", "sp-block-builder", "sp-consensus-aura", @@ -8593,8 +8875,8 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -8609,12 +8891,12 @@ dependencies = [ "futures", "kitchensink-runtime", "log", - "node-executor", "node-primitives", "pallet-asset-conversion", "pallet-asset-conversion-tx-payment", "pallet-asset-tx-payment", "pallet-assets", + "pallet-skip-feeless-payment", "parity-scale-codec", "sc-block-builder", "sc-client-api", @@ -8632,6 +8914,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-timestamp", + "staging-node-executor", "substrate-test-client", "tempfile", ] @@ -8888,6 +9171,16 @@ dependencies = [ ] [[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 = "os_str_bytes" version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8939,7 +9232,7 @@ dependencies = [ "sp-core-hashing", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -8959,7 +9252,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -8977,8 +9270,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", ] [[package]] @@ -8994,7 +9287,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9015,8 +9308,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", ] [[package]] @@ -9033,7 +9326,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9048,7 +9341,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9066,7 +9359,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9083,7 +9376,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9098,7 +9391,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9126,7 +9419,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9146,8 +9439,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -9173,9 +9466,9 @@ dependencies = [ "pallet-staking", "sp-core", "sp-runtime", - "sp-std", - "sp-storage", - "sp-tracing", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -9193,7 +9486,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9221,7 +9514,7 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9246,7 +9539,7 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9264,7 +9557,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9285,7 +9578,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-trie", ] @@ -9304,10 +9597,9 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9329,7 +9621,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-trie", ] @@ -9349,10 +9641,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", - "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9369,7 +9660,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9388,7 +9679,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9412,8 +9703,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -9429,7 +9720,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9444,7 +9735,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9461,10 +9752,13 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "log", + "pallet-assets", "pallet-balances", + "pallet-contracts-fixtures", "pallet-contracts-primitives", "pallet-contracts-proc-macro", "pallet-insecure-randomness-collective-flip", + "pallet-message-queue", "pallet-proxy", "pallet-timestamp", "pallet-utility", @@ -9480,13 +9774,63 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "staging-xcm", + "staging-xcm-builder", "wasm-instrument 0.4.0", "wasmi", "wat", ] [[package]] +name = "pallet-contracts-fixtures" +version = "1.0.0" +dependencies = [ + "frame-system", + "sp-runtime", + "wat", +] + +[[package]] +name = "pallet-contracts-mock-network" +version = "1.0.0" +dependencies = [ + "assert_matches", + "frame-support", + "frame-system", + "pallet-assets", + "pallet-balances", + "pallet-contracts", + "pallet-contracts-fixtures", + "pallet-contracts-primitives", + "pallet-contracts-proc-macro", + "pallet-insecure-randomness-collective-flip", + "pallet-message-queue", + "pallet-proxy", + "pallet-timestamp", + "pallet-utility", + "pallet-xcm", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-parachains", + "pretty_assertions", + "scale-info", + "sp-api", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "xcm-simulator", +] + +[[package]] name = "pallet-contracts-primitives" version = "24.0.0" dependencies = [ @@ -9494,7 +9838,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-weights", ] @@ -9523,7 +9867,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9540,7 +9884,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9554,7 +9898,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9574,7 +9918,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9590,7 +9934,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9615,8 +9959,8 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -9639,8 +9983,8 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "strum", ] @@ -9654,7 +9998,7 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9673,8 +10017,8 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "substrate-test-utils", ] @@ -9692,7 +10036,16 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", +] + +[[package]] +name = "pallet-example-frame-crate" +version = "0.0.1" +dependencies = [ + "frame", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -9709,7 +10062,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9726,7 +10079,7 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9741,7 +10094,7 @@ dependencies = [ "scale-info", "sp-core", "sp-io", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9751,6 +10104,7 @@ dependencies = [ "pallet-default-config-example", "pallet-dev-mode", "pallet-example-basic", + "pallet-example-frame-crate", "pallet-example-kitchensink", "pallet-example-offchain-worker", "pallet-example-split", @@ -9776,8 +10130,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "substrate-test-utils", ] @@ -9796,7 +10150,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9826,7 +10180,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9843,7 +10197,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9863,7 +10217,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9880,7 +10234,7 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9895,7 +10249,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9912,7 +10266,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9928,7 +10282,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9948,8 +10302,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "sp-weights", ] @@ -9969,7 +10323,7 @@ dependencies = [ "sp-io", "sp-mixnet", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -9989,7 +10343,7 @@ dependencies = [ "sp-io", "sp-mmr-primitives", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10005,7 +10359,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10024,7 +10378,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10043,7 +10397,7 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10067,7 +10421,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10084,7 +10438,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10099,7 +10453,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10116,8 +10470,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -10139,9 +10493,9 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface", + "sp-runtime-interface 17.0.0", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10156,7 +10510,7 @@ dependencies = [ "rand 0.8.5", "sp-io", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", ] [[package]] @@ -10166,7 +10520,7 @@ dependencies = [ "pallet-nomination-pools", "parity-scale-codec", "sp-api", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10189,8 +10543,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -10208,7 +10562,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10235,7 +10589,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10252,7 +10606,7 @@ dependencies = [ "sp-io", "sp-metadata-ir", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10295,7 +10649,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10312,7 +10666,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10329,7 +10683,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10345,7 +10699,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10367,7 +10721,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10383,7 +10737,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10404,7 +10758,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10418,7 +10772,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10437,7 +10791,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10454,7 +10808,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10472,7 +10826,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-weights", "substrate-test-utils", ] @@ -10489,7 +10843,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10509,7 +10863,7 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std", + "sp-std 8.0.0", "sp-trie", ] @@ -10533,7 +10887,19 @@ dependencies = [ "sp-io", "sp-runtime", "sp-session", - "sp-std", + "sp-std 8.0.0", +] + +[[package]] +name = "pallet-skip-feeless-payment" +version = "1.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std 8.0.0", ] [[package]] @@ -10553,7 +10919,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10581,8 +10947,8 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "substrate-test-utils", ] @@ -10611,6 +10977,7 @@ version = "4.0.0-dev" dependencies = [ "parity-scale-codec", "sp-api", + "sp-staking", ] [[package]] @@ -10630,8 +10997,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "substrate-state-trie-migration-rpc", "thousands", "tokio", @@ -10653,7 +11020,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-statement-store", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10669,7 +11036,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10684,7 +11051,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10702,8 +11069,8 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-timestamp", ] @@ -10723,8 +11090,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", ] [[package]] @@ -10741,7 +11108,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10787,7 +11154,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-transaction-storage-proof", ] @@ -10808,7 +11175,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10826,7 +11193,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10843,7 +11210,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10862,7 +11229,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10879,7 +11246,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10897,7 +11264,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10909,6 +11276,7 @@ dependencies = [ "frame-support", "frame-system", "log", + "pallet-assets", "pallet-balances", "parity-scale-codec", "polkadot-parachain-primitives", @@ -10918,7 +11286,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10942,8 +11310,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10963,25 +11331,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", ] [[package]] -name = "parachain-info" -version = "0.1.0" -dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std", -] - -[[package]] name = "parachain-template-node" version = "0.1.0" dependencies = [ @@ -11023,6 +11378,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "serde", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -11063,6 +11419,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-parachain-template", "pallet-session", "pallet-sudo", @@ -11070,7 +11427,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", - "parachain-info", + "parachains-common", "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-runtime-common", @@ -11085,9 +11442,10 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -11109,7 +11467,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "parachain-info", + "pallet-message-queue", "parity-scale-codec", "polkadot-core-primitives", "polkadot-primitives", @@ -11120,7 +11478,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "substrate-wasm-builder", @@ -11132,7 +11491,6 @@ name = "parachains-runtimes-test-utils" version = "1.0.0" dependencies = [ "assets-common", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", @@ -11146,7 +11504,6 @@ dependencies = [ "pallet-collator-selection", "pallet-session", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-parachain-primitives", @@ -11154,8 +11511,9 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "staging-parachain-info", "staging-xcm", "staging-xcm-executor", "substrate-wasm-builder", @@ -11326,15 +11684,6 @@ dependencies = [ [[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 = "pbkdf2" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" @@ -11367,6 +11716,21 @@ dependencies = [ ] [[package]] +name = "penpal-emulated-chain" +version = "0.0.0" +dependencies = [ + "cumulus-primitives-core", + "emulated-integration-tests-common", + "frame-support", + "parachains-common", + "penpal-runtime", + "rococo-emulated-chain", + "serde_json", + "sp-core", + "sp-runtime", +] + +[[package]] name = "penpal-runtime" version = "0.9.27" dependencies = [ @@ -11393,13 +11757,13 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", "pallet-session", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-parachain-primitives", @@ -11416,10 +11780,11 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -11586,7 +11951,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "1.3.0" +version = "1.4.0" dependencies = [ "assert_cmd", "color-eyre", @@ -11610,9 +11975,11 @@ name = "polkadot-approval-distribution" version = "1.0.0" dependencies = [ "assert_matches", + "bitvec", "env_logger 0.9.3", "futures", "futures-timer", + "itertools 0.10.5", "log", "polkadot-node-jaeger", "polkadot-node-metrics", @@ -11683,7 +12050,7 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing", + "sp-tracing 10.0.0", "thiserror", "tracing-gum", ] @@ -11784,7 +12151,7 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -11815,7 +12182,7 @@ dependencies = [ "sp-application-crypto", "sp-keyring", "sp-keystore", - "sp-tracing", + "sp-tracing 10.0.0", "thiserror", "tracing-gum", ] @@ -11858,7 +12225,7 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing", + "sp-tracing 10.0.0", "tracing-gum", ] @@ -11920,10 +12287,13 @@ dependencies = [ "async-trait", "bitvec", "derive_more", + "env_logger 0.9.3", "futures", "futures-timer", + "itertools 0.10.5", "kvdb", "kvdb-memorydb", + "log", "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", @@ -11935,6 +12305,8 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_core 0.5.1", "sc-keystore", "schnellru", @@ -12002,7 +12374,7 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing", + "sp-tracing 10.0.0", "thiserror", "tracing-gum", ] @@ -12111,7 +12483,7 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing", + "sp-tracing 10.0.0", "thiserror", "tracing-gum", ] @@ -12199,14 +12571,17 @@ dependencies = [ "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-parachain-primitives", "polkadot-primitives", + "procfs", "rand 0.8.5", "rococo-runtime", + "rusty-fork", "slotmap", "sp-core", "sp-maybe-compressed-blob", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "tempfile", "test-parachain-adder", "test-parachain-halt", @@ -12253,12 +12628,13 @@ dependencies = [ "sc-executor", "sc-executor-common", "sc-executor-wasmtime", + "seccompiler", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-io", - "sp-tracing", + "sp-tracing 10.0.0", "tempfile", - "tokio", + "thiserror", "tracing-gum", ] @@ -12267,16 +12643,13 @@ name = "polkadot-node-core-pvf-execute-worker" version = "1.0.0" dependencies = [ "cpu-time", - "futures", + "libc", + "nix 0.27.1", + "os_pipe", "parity-scale-codec", "polkadot-node-core-pvf-common", "polkadot-parachain-primitives", "polkadot-primitives", - "rayon", - "sp-core", - "sp-maybe-compressed-blob", - "sp-tracing", - "tokio", "tracing-gum", ] @@ -12285,21 +12658,21 @@ name = "polkadot-node-core-pvf-prepare-worker" version = "1.0.0" dependencies = [ "cfg-if", - "futures", + "criterion 0.4.0", "libc", + "nix 0.27.1", + "os_pipe", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain-primitives", "polkadot-primitives", "rayon", - "sc-executor", + "rococo-runtime", "sc-executor-common", "sc-executor-wasmtime", - "sp-io", "sp-maybe-compressed-blob", - "sp-tracing", + "staging-tracking-allocator", "tikv-jemalloc-ctl", - "tokio", + "tikv-jemallocator", "tracing-gum", ] @@ -12395,6 +12768,7 @@ dependencies = [ name = "polkadot-node-primitives" version = "1.0.0" dependencies = [ + "bitvec", "bounded-vec", "futures", "parity-scale-codec", @@ -12446,6 +12820,7 @@ name = "polkadot-node-subsystem-types" version = "1.0.0" dependencies = [ "async-trait", + "bitvec", "derive_more", "futures", "orchestra", @@ -12536,7 +12911,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.1.0" +version = "1.4.0" dependencies = [ "assert_cmd", "asset-hub-kusama-runtime", @@ -12547,8 +12922,10 @@ dependencies = [ "bridge-hub-kusama-runtime", "bridge-hub-polkadot-runtime", "bridge-hub-rococo-runtime", + "bridge-hub-westend-runtime", "clap 4.4.6", "collectives-polkadot-runtime", + "collectives-westend-runtime", "color-print", "contracts-rococo-runtime", "cumulus-client-cli", @@ -12566,6 +12943,7 @@ dependencies = [ "frame-benchmarking-cli", "futures", "glutton-runtime", + "glutton-westend-runtime", "hex-literal", "jsonrpsee", "log", @@ -12608,6 +12986,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-timestamp", + "sp-tracing 10.0.0", "sp-transaction-pool", "staging-xcm", "substrate-build-script-utils", @@ -12625,14 +13004,14 @@ version = "1.0.0" dependencies = [ "bounded-collections", "derive_more", - "frame-support", "parity-scale-codec", "polkadot-core-primitives", "scale-info", "serde", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", + "sp-weights", ] [[package]] @@ -12657,7 +13036,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -12723,6 +13102,7 @@ dependencies = [ "pallet-balances", "pallet-election-provider-multi-phase", "pallet-fast-unstake", + "pallet-identity", "pallet-session", "pallet-staking", "pallet-staking-reward-fn", @@ -12751,7 +13131,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -12766,8 +13146,8 @@ dependencies = [ "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -12818,8 +13198,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "staging-xcm", "staging-xcm-executor", "static_assertions", @@ -12885,6 +13265,7 @@ dependencies = [ "polkadot-overseer", "polkadot-parachain-primitives", "polkadot-primitives", + "polkadot-primitives-test-helpers", "polkadot-rpc", "polkadot-runtime-parachains", "polkadot-statement-distribution", @@ -12936,7 +13317,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage", + "sp-storage 13.0.0", "sp-timestamp", "sp-transaction-pool", "sp-version", @@ -12979,7 +13360,7 @@ dependencies = [ "sp-keyring", "sp-keystore", "sp-staking", - "sp-tracing", + "sp-tracing 10.0.0", "thiserror", "tracing-gum", ] @@ -13107,7 +13488,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", "sp-trie", "sp-version", @@ -13440,14 +13821,40 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] +name = "procfs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +dependencies = [ + "bitflags 2.4.0", + "chrono", + "flate2", + "hex", + "lazy_static", + "procfs-core", + "rustix 0.38.21", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.4.0", + "chrono", + "hex", +] + +[[package]] name = "prometheus" version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -13639,9 +14046,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" dependencies = [ "bytes", "rand 0.8.5", @@ -13796,7 +14203,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring 0.16.20", - "time", + "time 0.3.27", "x509-parser 0.13.2", "yasna", ] @@ -13809,7 +14216,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring 0.16.20", - "time", + "time 0.3.27", "yasna", ] @@ -13940,7 +14347,7 @@ dependencies = [ "log", "pallet-bags-list-remote-tests", "sp-core", - "sp-tracing", + "sp-tracing 10.0.0", "tokio", "westend-runtime", "westend-runtime-constants", @@ -14074,6 +14481,25 @@ dependencies = [ ] [[package]] +name = "rococo-emulated-chain" +version = "0.0.0" +dependencies = [ + "emulated-integration-tests-common", + "pallet-im-online", + "parachains-common", + "polkadot-primitives", + "rococo-runtime", + "rococo-runtime-constants", + "sc-consensus-grandpa", + "serde_json", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-runtime", +] + +[[package]] name = "rococo-parachain-runtime" version = "0.1.0" dependencies = [ @@ -14093,12 +14519,12 @@ dependencies = [ "pallet-assets", "pallet-aura", "pallet-balances", + "pallet-message-queue", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-xcm", - "parachain-info", "parachains-common", "parity-scale-codec", "polkadot-parachain-primitives", @@ -14113,9 +14539,10 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -14165,6 +14592,7 @@ dependencies = [ "pallet-ranked-collective", "pallet-recovery", "pallet-referenda", + "pallet-root-testing", "pallet-scheduler", "pallet-session", "pallet-society", @@ -14209,9 +14637,9 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", - "sp-storage", - "sp-tracing", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", "sp-transaction-pool", "sp-trie", "sp-version", @@ -14239,6 +14667,30 @@ dependencies = [ ] [[package]] +name = "rococo-system-emulated-network" +version = "0.0.0" +dependencies = [ + "asset-hub-rococo-emulated-chain", + "bridge-hub-rococo-emulated-chain", + "emulated-integration-tests-common", + "penpal-emulated-chain", + "rococo-emulated-chain", +] + +[[package]] +name = "rococo-westend-system-emulated-network" +version = "0.0.0" +dependencies = [ + "asset-hub-rococo-emulated-chain", + "asset-hub-westend-emulated-chain", + "bridge-hub-rococo-emulated-chain", + "bridge-hub-westend-emulated-chain", + "emulated-integration-tests-common", + "rococo-emulated-chain", + "westend-emulated-chain", +] + +[[package]] name = "rpassword" version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -14374,14 +14826,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] @@ -14478,6 +14930,7 @@ dependencies = [ "fnv", "quick-error", "tempfile", + "wait-timeout", ] [[package]] @@ -14541,7 +14994,7 @@ version = "4.1.0-dev" dependencies = [ "log", "sp-core", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "thiserror", ] @@ -14569,7 +15022,7 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -14605,7 +15058,6 @@ name = "sc-block-builder" version = "0.10.0-dev" dependencies = [ "parity-scale-codec", - "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", @@ -14620,7 +15072,11 @@ dependencies = [ name = "sc-chain-spec" version = "4.0.0-dev" dependencies = [ + "array-bytes 6.1.0", + "docify", + "log", "memmap2", + "parity-scale-codec", "sc-chain-spec-derive", "sc-client-api", "sc-executor", @@ -14628,10 +15084,16 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", + "sp-application-crypto", "sp-blockchain", + "sp-consensus-babe", "sp-core", + "sp-genesis-builder", + "sp-io", + "sp-keyring", "sp-runtime", "sp-state-machine", + "substrate-test-runtime", ] [[package]] @@ -14649,11 +15111,13 @@ name = "sc-cli" version = "0.10.0-dev" dependencies = [ "array-bytes 6.1.0", + "bip39", "chrono", "clap 4.4.6", "fdlimit", "futures", "futures-timer", + "itertools 0.10.5", "libp2p-identity", "log", "names 0.13.0", @@ -14678,11 +15142,10 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "sp-version", "tempfile", "thiserror", - "tiny-bip39", "tokio", ] @@ -14703,11 +15166,11 @@ dependencies = [ "sp-consensus", "sp-core", "sp-database", - "sp-externalities", + "sp-externalities 0.19.0", "sp-runtime", "sp-state-machine", "sp-statement-store", - "sp-storage", + "sp-storage 13.0.0", "sp-test-primitives", "sp-trie", "substrate-prometheus-endpoint", @@ -14742,7 +15205,7 @@ dependencies = [ "sp-database", "sp-runtime", "sp-state-machine", - "sp-tracing", + "sp-tracing 10.0.0", "sp-trie", "substrate-test-runtime-client", "tempfile", @@ -14803,7 +15266,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "tempfile", @@ -14845,7 +15308,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -14913,7 +15376,7 @@ dependencies = [ "sp-keystore", "sp-mmr-primitives", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "tempfile", @@ -14979,6 +15442,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-gossip", + "sc-network-sync", "sc-network-test", "sc-telemetry", "sc-transaction-pool-api", @@ -14995,7 +15459,7 @@ dependencies = [ "sp-keyring", "sp-keystore", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -15131,17 +15595,17 @@ dependencies = [ "schnellru", "sp-api", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-io", "sp-maybe-compressed-blob", "sp-panic-handler", "sp-runtime", - "sp-runtime-interface", + "sp-runtime-interface 17.0.0", "sp-state-machine", - "sp-tracing", + "sp-tracing 10.0.0", "sp-trie", "sp-version", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "substrate-test-runtime", "tempfile", "tracing", @@ -15155,7 +15619,7 @@ version = "0.10.0-dev" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "thiserror", "wasm-instrument 0.3.0", ] @@ -15177,8 +15641,8 @@ dependencies = [ "sc-executor-common", "sc-runtime-test", "sp-io", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-runtime-interface 17.0.0", + "sp-wasm-interface 14.0.0", "tempfile", "wasmtime", "wat", @@ -15195,6 +15659,7 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-common", + "sc-network-sync", "sp-blockchain", "sp-runtime", ] @@ -15278,7 +15743,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-test-primitives", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-prometheus-endpoint", "substrate-test-runtime", "substrate-test-runtime-client", @@ -15347,6 +15812,7 @@ dependencies = [ "quickcheck", "sc-network", "sc-network-common", + "sc-network-sync", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", @@ -15387,6 +15853,7 @@ dependencies = [ "parity-scale-codec", "sc-network", "sc-network-common", + "sc-network-sync", "sp-consensus", "sp-statement-store", "substrate-prometheus-endpoint", @@ -15424,7 +15891,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-test-primitives", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -15456,7 +15923,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-test-runtime", "substrate-test-runtime-client", "tokio", @@ -15473,6 +15940,7 @@ dependencies = [ "parity-scale-codec", "sc-network", "sc-network-common", + "sc-network-sync", "sc-utils", "sp-consensus", "sp-runtime", @@ -15509,11 +15977,11 @@ dependencies = [ "sp-api", "sp-consensus", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-keystore", "sp-offchain", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-test-runtime-client", "threadpool", "tokio", @@ -15628,6 +16096,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-maybe-compressed-blob", + "sp-rpc", "sp-runtime", "sp-version", "substrate-test-runtime", @@ -15644,8 +16113,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", "substrate-wasm-builder", ] @@ -15664,7 +16133,6 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -15693,12 +16161,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -15741,8 +16209,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-storage", - "sp-tracing", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", "sp-trie", "substrate-test-runtime", "substrate-test-runtime-client", @@ -15815,6 +16283,7 @@ dependencies = [ name = "sc-sysinfo" version = "6.0.0-dev" dependencies = [ + "derive_more", "futures", "libc", "log", @@ -15827,7 +16296,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -15870,7 +16339,7 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "thiserror", "tracing", "tracing-log", @@ -15911,7 +16380,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "sp-transaction-pool", "substrate-prometheus-endpoint", "substrate-test-runtime", @@ -16104,6 +16573,15 @@ dependencies = [ ] [[package]] +name = "seccompiler" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5" +dependencies = [ + "libc", +] + +[[package]] name = "secp256k1" version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16169,7 +16647,6 @@ dependencies = [ "pallet-balances", "pallet-sudo", "pallet-timestamp", - "parachain-info", "parachains-common", "parity-scale-codec", "scale-info", @@ -16182,9 +16659,10 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "substrate-wasm-builder", ] @@ -16258,9 +16736,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -16416,8 +16894,8 @@ dependencies = [ "frame-system", "frame-try-runtime", "pallet-aura", + "pallet-message-queue", "pallet-timestamp", - "parachain-info", "parachains-common", "parity-scale-codec", "scale-info", @@ -16430,9 +16908,10 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -16498,6 +16977,11 @@ dependencies = [ ] [[package]] +name = "simple-mermaid" +version = "0.1.0" +source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b" + +[[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16526,7 +17010,7 @@ dependencies = [ "parity-scale-codec", "paste", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -16721,11 +17205,11 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 8.0.0", "sp-test-primitives", "sp-trie", "sp-version", @@ -16762,7 +17246,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-tracing", + "sp-tracing 10.0.0", "sp-version", "static_assertions", "substrate-test-runtime-client", @@ -16778,7 +17262,7 @@ dependencies = [ "serde", "sp-core", "sp-io", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -16805,7 +17289,7 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-std", + "sp-std 8.0.0", "static_assertions", ] @@ -16821,6 +17305,24 @@ dependencies = [ ] [[package]] +name = "sp-ark-bls12-381" +version = "0.4.2" +source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" +dependencies = [ + "ark-bls12-381-ext", + "sp-crypto-ec-utils 0.4.1 (git+https://github.com/paritytech/polkadot-sdk)", +] + +[[package]] +name = "sp-ark-ed-on-bls12-381-bandersnatch" +version = "0.4.2" +source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" +dependencies = [ + "ark-ed-on-bls12-381-bandersnatch-ext", + "sp-crypto-ec-utils 0.4.1 (git+https://github.com/paritytech/polkadot-sdk)", +] + +[[package]] name = "sp-authority-discovery" version = "4.0.0-dev" dependencies = [ @@ -16829,7 +17331,7 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -16839,7 +17341,7 @@ dependencies = [ "sp-api", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -16886,7 +17388,7 @@ dependencies = [ "sp-consensus-slots", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-timestamp", ] @@ -16904,7 +17406,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-timestamp", ] @@ -16923,7 +17425,7 @@ dependencies = [ "sp-io", "sp-mmr-primitives", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "strum", "w3f-bls", ] @@ -16942,7 +17444,7 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -16953,7 +17455,7 @@ dependencies = [ "sp-api", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -16968,7 +17470,7 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -16978,7 +17480,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 8.0.0", "sp-timestamp", ] @@ -16988,6 +17490,7 @@ version = "21.0.0" dependencies = [ "array-bytes 6.1.0", "bandersnatch_vrfs", + "bip39", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", @@ -16999,6 +17502,7 @@ dependencies = [ "hash-db", "hash256-std-hasher", "impl-serde", + "itertools 0.10.5", "lazy_static", "libsecp256k1", "log", @@ -17017,15 +17521,14 @@ dependencies = [ "serde_json", "sp-core-hashing", "sp-core-hashing-proc-macro", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-debug-derive 8.0.0", + "sp-externalities 0.19.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39", "tracing", "w3f-bls", "zeroize", @@ -17054,17 +17557,43 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" -version = "0.4.0" +version = "0.4.1" +dependencies = [ + "ark-bls12-377", + "ark-bls12-377-ext", + "ark-bls12-381", + "ark-bls12-381-ext", + "ark-bw6-761", + "ark-bw6-761-ext", + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-377-ext", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ed-on-bls12-381-bandersnatch-ext", + "ark-scale", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", +] + +[[package]] +name = "sp-crypto-ec-utils" +version = "0.4.1" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" dependencies = [ "ark-bls12-377", + "ark-bls12-377-ext", "ark-bls12-381", + "ark-bls12-381-ext", "ark-bw6-761", + "ark-bw6-761-ext", "ark-ec", "ark-ed-on-bls12-377", + "ark-ed-on-bls12-377-ext", "ark-ed-on-bls12-381-bandersnatch", + "ark-ed-on-bls12-381-bandersnatch-ext", "ark-scale", - "sp-runtime-interface", - "sp-std", + "sp-runtime-interface 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", ] [[package]] @@ -17085,13 +17614,34 @@ dependencies = [ ] [[package]] +name = "sp-debug-derive" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "sp-externalities" +version = "0.19.0" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 8.0.0", + "sp-storage 13.0.0", +] + +[[package]] name = "sp-externalities" version = "0.19.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-storage 13.0.0 (git+https://github.com/paritytech/polkadot-sdk)", ] [[package]] @@ -17101,7 +17651,7 @@ dependencies = [ "serde_json", "sp-api", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -17114,7 +17664,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "thiserror", ] @@ -17130,12 +17680,12 @@ dependencies = [ "rustversion", "secp256k1", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-keystore", - "sp-runtime-interface", + "sp-runtime-interface 17.0.0", "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "sp-trie", "tracing", "tracing-core", @@ -17160,7 +17710,7 @@ dependencies = [ "rand 0.7.3", "rand_chacha 0.2.2", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "thiserror", ] @@ -17179,7 +17729,7 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -17190,7 +17740,7 @@ dependencies = [ "scale-info", "sp-api", "sp-application-crypto", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -17205,9 +17755,9 @@ dependencies = [ "serde", "sp-api", "sp-core", - "sp-debug-derive", + "sp-debug-derive 8.0.0", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "thiserror", ] @@ -17222,7 +17772,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "substrate-test-utils", ] @@ -17285,8 +17835,8 @@ dependencies = [ "sp-core", "sp-io", "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "sp-weights", "substrate-test-runtime-client", "zstd 0.12.4", @@ -17302,22 +17852,52 @@ dependencies = [ "primitive-types", "rustversion", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-io", - "sp-runtime-interface-proc-macro", + "sp-runtime-interface-proc-macro 11.0.0", "sp-runtime-interface-test-wasm", "sp-state-machine", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", + "sp-wasm-interface 14.0.0", "static_assertions", "trybuild", ] [[package]] +name = "sp-runtime-interface" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.19.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-runtime-interface-proc-macro 11.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-storage 13.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-tracing 10.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-wasm-interface 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "11.0.0" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" dependencies = [ "Inflector", "proc-macro-crate", @@ -17334,7 +17914,7 @@ dependencies = [ "sc-executor-common", "sp-io", "sp-runtime", - "sp-runtime-interface", + "sp-runtime-interface 17.0.0", "sp-runtime-interface-test-wasm", "sp-runtime-interface-test-wasm-deprecated", "sp-state-machine", @@ -17349,8 +17929,8 @@ dependencies = [ "bytes", "sp-core", "sp-io", - "sp-runtime-interface", - "sp-std", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", "substrate-wasm-builder", ] @@ -17360,7 +17940,7 @@ version = "2.0.0" dependencies = [ "sp-core", "sp-io", - "sp-runtime-interface", + "sp-runtime-interface 17.0.0", "substrate-wasm-builder", ] @@ -17375,7 +17955,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -17388,7 +17968,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -17405,10 +17985,10 @@ dependencies = [ "rand 0.8.5", "smallvec", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-panic-handler", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-trie", "thiserror", "tracing", @@ -17430,10 +18010,10 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", "thiserror", "x25519-dalek 2.0.0", ] @@ -17443,15 +18023,33 @@ name = "sp-std" version = "8.0.0" [[package]] +name = "sp-std" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" + +[[package]] +name = "sp-storage" +version = "13.0.0" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", +] + +[[package]] name = "sp-storage" version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", ] [[package]] @@ -17464,7 +18062,7 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -17475,7 +18073,7 @@ dependencies = [ "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "thiserror", ] @@ -17484,7 +18082,19 @@ name = "sp-tracing" version = "10.0.0" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 8.0.0", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +dependencies = [ + "parity-scale-codec", + "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", "tracing", "tracing-core", "tracing-subscriber", @@ -17508,7 +18118,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-trie", ] @@ -17531,7 +18141,7 @@ dependencies = [ "schnellru", "sp-core", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "thiserror", "tracing", "trie-bench", @@ -17551,7 +18161,7 @@ dependencies = [ "serde", "sp-core-hashing-proc-macro", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-version-proc-macro", "thiserror", ] @@ -17575,7 +18185,20 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 8.0.0", + "wasmtime", +] + +[[package]] +name = "sp-wasm-interface" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", "wasmtime", ] @@ -17589,8 +18212,8 @@ dependencies = [ "smallvec", "sp-arithmetic", "sp-core", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", ] [[package]] @@ -17658,6 +18281,188 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] +name = "staging-chain-spec-builder" +version = "2.0.0" +dependencies = [ + "ansi_term", + "clap 4.4.6", + "kitchensink-runtime", + "log", + "rand 0.8.5", + "sc-chain-spec", + "sc-keystore", + "serde_json", + "sp-core", + "sp-keystore", + "sp-tracing 10.0.0", + "staging-node-cli", +] + +[[package]] +name = "staging-node-cli" +version = "3.0.0-dev" +dependencies = [ + "array-bytes 6.1.0", + "assert_cmd", + "clap 4.4.6", + "clap_complete", + "criterion 0.4.0", + "frame-benchmarking-cli", + "frame-system", + "frame-system-rpc-runtime-api", + "futures", + "jsonrpsee", + "kitchensink-runtime", + "log", + "nix 0.26.2", + "node-primitives", + "node-rpc", + "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-balances", + "pallet-im-online", + "pallet-skip-feeless-payment", + "pallet-timestamp", + "parity-scale-codec", + "platforms", + "rand 0.8.5", + "regex", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-consensus-grandpa", + "sc-consensus-slots", + "sc-executor", + "sc-keystore", + "sc-mixnet", + "sc-network", + "sc-network-common", + "sc-network-statement", + "sc-network-sync", + "sc-offchain", + "sc-rpc", + "sc-service", + "sc-service-test", + "sc-statement-store", + "sc-storage-monitor", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "serde_json", + "soketto", + "sp-api", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-keystore", + "sp-mixnet", + "sp-runtime", + "sp-statement-store", + "sp-timestamp", + "sp-tracing 10.0.0", + "sp-transaction-storage-proof", + "staging-node-executor", + "staging-node-inspect", + "substrate-build-script-utils", + "substrate-cli-test-utils", + "substrate-frame-cli", + "substrate-rpc-client", + "tempfile", + "tokio", + "tokio-util", + "try-runtime-cli", + "wait-timeout", +] + +[[package]] +name = "staging-node-executor" +version = "3.0.0-dev" +dependencies = [ + "criterion 0.4.0", + "frame-benchmarking", + "frame-support", + "frame-system", + "futures", + "kitchensink-runtime", + "node-primitives", + "node-testing", + "pallet-balances", + "pallet-contracts", + "pallet-glutton", + "pallet-im-online", + "pallet-root-testing", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-treasury", + "parity-scale-codec", + "sc-executor", + "scale-info", + "serde_json", + "sp-application-crypto", + "sp-consensus-babe", + "sp-core", + "sp-externalities 0.19.0", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-statement-store", + "sp-tracing 10.0.0", + "sp-trie", + "wat", +] + +[[package]] +name = "staging-node-inspect" +version = "0.9.0-dev" +dependencies = [ + "clap 4.4.6", + "parity-scale-codec", + "sc-cli", + "sc-client-api", + "sc-service", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "staging-parachain-info" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std 8.0.0", +] + +[[package]] +name = "staging-tracking-allocator" +version = "1.0.0" + +[[package]] name = "staging-xcm" version = "1.0.0" dependencies = [ @@ -17700,7 +18505,7 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-weights", "staging-xcm", "staging-xcm-executor", @@ -17716,11 +18521,12 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "sp-weights", "staging-xcm", ] @@ -17843,9 +18649,8 @@ dependencies = [ name = "substrate" version = "1.0.0" dependencies = [ - "aquamarine", - "chain-spec-builder", "frame-support", + "sc-chain-spec", "sc-cli", "sc-consensus-aura", "sc-consensus-babe", @@ -17854,7 +18659,9 @@ dependencies = [ "sc-consensus-manual-seal", "sc-consensus-pow", "sc-service", + "simple-mermaid", "sp-runtime", + "staging-chain-spec-builder", "subkey", ] @@ -17882,12 +18689,12 @@ dependencies = [ "assert_cmd", "futures", "nix 0.26.2", - "node-cli", "node-primitives", "regex", "sc-cli", "sc-service", "sp-rpc", + "staging-node-cli", "substrate-rpc-client", "tokio", ] @@ -17917,7 +18724,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-storage", + "sp-storage 13.0.0", "tokio", ] @@ -17939,7 +18746,7 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", - "sp-tracing", + "sp-tracing 10.0.0", "substrate-test-runtime-client", "tokio", ] @@ -18042,7 +18849,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-grandpa", "sp-core", - "sp-externalities", + "sp-externalities 0.19.0", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -18051,8 +18858,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "sp-transaction-pool", "sp-trie", "sp-version", @@ -18325,7 +19132,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.8", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -18339,6 +19146,16 @@ dependencies = [ ] [[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.21", + "windows-sys 0.48.0", +] + +[[package]] name = "termtree" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -18352,7 +19169,7 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "sp-io", - "sp-std", + "sp-std 8.0.0", "substrate-wasm-builder", "tiny-keccak", ] @@ -18400,7 +19217,7 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "sp-io", - "sp-std", + "sp-std 8.0.0", "substrate-wasm-builder", "tiny-keccak", ] @@ -18456,6 +19273,19 @@ dependencies = [ ] [[package]] +name = "testnets-common" +version = "1.0.0" +dependencies = [ + "frame-support", + "polkadot-core-primitives", + "rococo-runtime-constants", + "smallvec", + "sp-runtime", + "substrate-wasm-builder", + "westend-runtime-constants", +] + +[[package]] name = "textwrap" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -18572,6 +19402,17 @@ dependencies = [ [[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.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" @@ -18599,25 +19440,6 @@ dependencies = [ ] [[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2 0.11.0", - "rand 0.8.5", - "rustc-hash", - "sha2 0.10.7", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - -[[package]] name = "tiny-keccak" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -18887,7 +19709,6 @@ name = "tracing-gum" version = "1.0.0" dependencies = [ "coarsetime", - "polkadot-node-jaeger", "polkadot-primitives", "tracing", "tracing-gum-proc-macro", @@ -19071,8 +19892,8 @@ dependencies = [ "sp-consensus-aura", "sp-consensus-babe", "sp-core", - "sp-debug-derive", - "sp-externalities", + "sp-debug-derive 8.0.0", + "sp-externalities 0.19.0", "sp-inherents", "sp-io", "sp-keystore", @@ -19424,6 +20245,12 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -19924,7 +20751,7 @@ dependencies = [ "sha2 0.10.7", "stun", "thiserror", - "time", + "time 0.3.27", "tokio", "turn", "url", @@ -20107,6 +20934,26 @@ dependencies = [ ] [[package]] +name = "westend-emulated-chain" +version = "0.0.0" +dependencies = [ + "emulated-integration-tests-common", + "pallet-im-online", + "pallet-staking", + "parachains-common", + "polkadot-primitives", + "sc-consensus-grandpa", + "serde_json", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-runtime", + "westend-runtime", + "westend-runtime-constants", +] + +[[package]] name = "westend-runtime" version = "1.0.0" dependencies = [ @@ -20155,6 +21002,7 @@ dependencies = [ "pallet-proxy", "pallet-recovery", "pallet-referenda", + "pallet-root-testing", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", @@ -20202,9 +21050,9 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", - "sp-storage", - "sp-tracing", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -20231,6 +21079,17 @@ dependencies = [ ] [[package]] +name = "westend-system-emulated-network" +version = "0.0.0" +dependencies = [ + "asset-hub-westend-emulated-chain", + "bridge-hub-westend-emulated-chain", + "emulated-integration-tests-common", + "penpal-emulated-chain", + "westend-emulated-chain", +] + +[[package]] name = "which" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -20539,7 +21398,7 @@ dependencies = [ "ring 0.16.20", "rusticata-macros", "thiserror", - "time", + "time 0.3.27", ] [[package]] @@ -20557,7 +21416,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time", + "time 0.3.27", ] [[package]] @@ -20574,6 +21433,7 @@ name = "xcm-emulator" version = "0.1.0" dependencies = [ "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-test-relay-sproof-builder", @@ -20594,8 +21454,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "staging-xcm", "staging-xcm-executor", ] @@ -20616,7 +21476,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-tracing", + "sp-tracing 10.0.0", "staging-xcm", "staging-xcm-executor", ] @@ -20629,6 +21489,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.38", + "trybuild", ] [[package]] @@ -20642,7 +21503,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-runtime-parachains", "sp-io", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -20667,8 +21528,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -20694,7 +21555,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 8.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -20727,7 +21588,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time", + "time 0.3.27", ] [[package]] diff --git a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index f391ccac7904..e1b042aadbb6 100644 --- a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; - rev = "polkadot-v${version}"; - hash = "sha256-7hCQdJHzuPQTNZFDGEZG/Q6G/Gh/gJANV5uiL/d6Pas="; + rev = "v${version}"; + hash = "sha256-Tblknr9nU6X4lKMW8ZPOo7jZ/MoE8e8G58NnLITzhxY="; # 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. @@ -41,9 +41,12 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ark-secret-scalar-0.0.2" = "sha256-GROzlo+1QQ8wd090/esQRmaV8KWjNEfUlFlldnME28A="; + "ark-secret-scalar-0.0.2" = "sha256-rnU9+rf0POv4GuxKUp9Wv4/eNXi5gfGq+XhJLxpmSzU="; "common-0.1.0" = "sha256-ru++KG2ZZqa/wDGnKF/VfWnazHRSpOAD0WYb7rHlpCU="; "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; + "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w="; + "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; + "sp-crypto-ec-utils-0.4.1" = "sha256-cv2mr5K6mAKiACVzS7mPOIpoyt8iUfGZXsqVuiGXbL0="; }; }; diff --git a/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix b/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix index f3ea89a73f01..8513eb6de413 100644 --- a/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix @@ -55,5 +55,6 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; platforms = platforms.unix; + mainProgram = "snarkos"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix b/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix index 6d3359cdcd00..5a70cce93174 100644 --- a/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = [ ]; platforms = lib.platforms.linux; + mainProgram = "stellar-core"; }; }) diff --git a/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix b/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix index 7b82f2658a1c..cf684e062c5c 100644 --- a/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = [ maintainers.peterwilli ]; platforms = [ "x86_64-linux" ]; + mainProgram = "terra-station"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/tessera/default.nix b/nixpkgs/pkgs/applications/blockchains/tessera/default.nix index a0facc33b7dd..03bd6734a9a5 100644 --- a/nixpkgs/pkgs/applications/blockchains/tessera/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/tessera/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ mmahut ]; + mainProgram = "tessera"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/torq/default.nix b/nixpkgs/pkgs/applications/blockchains/torq/default.nix index c57ab07e4045..7518508f64b1 100644 --- a/nixpkgs/pkgs/applications/blockchains/torq/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/torq/default.nix @@ -56,5 +56,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/lncapital/torq"; maintainers = with maintainers; [ mmilata prusnak ]; + mainProgram = "torq"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index e5f8963e921c..bff5cad84e4f 100644 --- a/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -59,5 +59,6 @@ appimageTools.wrapType2 rec { license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; + mainProgram = "trezor-suite"; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix b/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix index e3aad8cb0c5f..27004722c38e 100644 --- a/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix @@ -26,5 +26,6 @@ appimageTools.wrapType2 rec { license = licenses.mit; maintainers = with maintainers; [ colinsane ]; platforms = [ "x86_64-linux" ]; + mainProgram = "zecwallet-lite"; }; } diff --git a/nixpkgs/pkgs/applications/editors/amp/default.nix b/nixpkgs/pkgs/applications/editors/amp/default.nix index 7f4081a399e7..a1c96ea92beb 100644 --- a/nixpkgs/pkgs/applications/editors/amp/default.nix +++ b/nixpkgs/pkgs/applications/editors/amp/default.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { license = [ licenses.gpl3 ]; maintainers = [ maintainers.sb0 ]; platforms = platforms.unix; + mainProgram = "amp"; }; } diff --git a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix index bbc84b4caa5e..501f820664f2 100644 --- a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix +++ b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix @@ -54,5 +54,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "apostrophe"; }; } diff --git a/nixpkgs/pkgs/applications/editors/bless/default.nix b/nixpkgs/pkgs/applications/editors/bless/default.nix index dc7e0ff2f8ec..2ac885683eb1 100644 --- a/nixpkgs/pkgs/applications/editors/bless/default.nix +++ b/nixpkgs/pkgs/applications/editors/bless/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mkg20001 ]; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "bless"; }; } diff --git a/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/nixpkgs/pkgs/applications/editors/bluefish/default.nix index 6a5d3cbd1f6a..0ec47ceb9566 100644 --- a/nixpkgs/pkgs/applications/editors/bluefish/default.nix +++ b/nixpkgs/pkgs/applications/editors/bluefish/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ vbgl ]; platforms = platforms.all; + mainProgram = "bluefish"; }; } diff --git a/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix b/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix index 318c459dd21d..886e42414da1 100644 --- a/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix +++ b/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = [ maintainers.ilian ]; platforms = [ "i686-linux" "x86_64-linux" ]; + mainProgram = "bonzomatic"; }; } diff --git a/nixpkgs/pkgs/applications/editors/bviplus/default.nix b/nixpkgs/pkgs/applications/editors/bviplus/default.nix index 1cffe049c73d..ddf37bb69fc6 100644 --- a/nixpkgs/pkgs/applications/editors/bviplus/default.nix +++ b/nixpkgs/pkgs/applications/editors/bviplus/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "bviplus"; }; } diff --git a/nixpkgs/pkgs/applications/editors/codux/default.nix b/nixpkgs/pkgs/applications/editors/codux/default.nix index 3df06b23ff08..314f639f1060 100644 --- a/nixpkgs/pkgs/applications/editors/codux/default.nix +++ b/nixpkgs/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.13.0"; + version = "15.14.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-63t3v6abr9cZ0mKSPogevKwcFsvGh2udBPRn4k4XAd4="; + sha256 = "sha256-GTp9wJrL0TA0Jee1aXKAqmyHfotm7u7gxq/6W8+ermY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -31,5 +31,6 @@ appimageTools.wrapType2 rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ dit7ya kashw2 ]; + mainProgram = "codux"; }; } diff --git a/nixpkgs/pkgs/applications/editors/cpeditor/default.nix b/nixpkgs/pkgs/applications/editors/cpeditor/default.nix index 718c3fdd20fd..c7d56cf50abe 100644 --- a/nixpkgs/pkgs/applications/editors/cpeditor/default.nix +++ b/nixpkgs/pkgs/applications/editors/cpeditor/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ rewine ]; + mainProgram = "cpeditor"; }; } diff --git a/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/nixpkgs/pkgs/applications/editors/cudatext/default.nix index ad67837b3892..37b79d9815c3 100644 --- a/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.201.0.2"; + version = "1.202.1"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-ke7i0eeZHEsVhtzaS0AeLQOrYE1F+ppCwjR2TWeJQPA="; + hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4="; }; patches = [ ./proc_globdata.patch ]; @@ -118,5 +118,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + mainProgram = "cudatext"; }; } diff --git a/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/nixpkgs/pkgs/applications/editors/cudatext/deps.json index e2c4746735df..3a1e643c6f7f 100644 --- a/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.10.30", - "hash": "sha256-xsJ02zGzi7ByFBXql4lLWWLiPVWwtOLXzixmv4AeC2I=" + "rev": "2023.11.23", + "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2023.08.18", - "hash": "sha256-X/KFQfLAnbcquLSsOk0ve0X5SzoEgEG0q0JY4TuQXpY=" + "rev": "2023.11.16", + "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.10.02", - "hash": "sha256-mn+mTZZyDkc7P7w1PG/rDgp+rpXC3dahoiRk+DUDMHQ=" + "rev": "2023.11.23", + "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/nixpkgs/pkgs/applications/editors/dhex/default.nix b/nixpkgs/pkgs/applications/editors/dhex/default.nix index 743e55b09693..4ee1897bda79 100644 --- a/nixpkgs/pkgs/applications/editors/dhex/default.nix +++ b/nixpkgs/pkgs/applications/editors/dhex/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [qknight]; platforms = with lib.platforms; linux; + mainProgram = "dhex"; }; } diff --git a/nixpkgs/pkgs/applications/editors/dit/default.nix b/nixpkgs/pkgs/applications/editors/dit/default.nix index 90502172faa5..bb148ab9260e 100644 --- a/nixpkgs/pkgs/applications/editors/dit/default.nix +++ b/nixpkgs/pkgs/applications/editors/dit/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ davidak ]; + mainProgram = "dit"; }; } diff --git a/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/nixpkgs/pkgs/applications/editors/eclipse/default.nix index b9bd9c0b9634..72ecd8e094f4 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -9,7 +9,7 @@ # use ./update.sh to help with updating for each quarterly release # # then, to test: -# for e in cpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done +# for e in cpp dsl modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done let platform_major = "4"; @@ -49,6 +49,21 @@ in rec { }; }; + ### Eclipse DSL + + eclipse-dsl = buildEclipse { + name = "eclipse-dsl-${platform_major}.${platform_minor}"; + description = "Eclipse IDE for Java and DSL Developers"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha256-xdvEt26ovcT65Jy+ePEAHHMAyICBQwJser2uL9VrwrA="; + aarch64 = "sha256-GPgD29d81YFtHtqqb66io1BwbNuHTqVZYrY4Oh4MojQ="; + }.${arch}; + }; + }; + ### Eclipse Modeling eclipse-modeling = buildEclipse { diff --git a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index ca736f80e758..5e7a67101929 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -671,12 +671,12 @@ rec { srcFeature = fetchurl { url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.feature_${version}.jar"; - sha1 = "c8fb6c4aab32db13db0bd81c1a148032667fff31"; + hash = "sha256-iKe7oOPjy6th0HmKt6NXexOHN60EDpQe1r+n6K+uoyw="; }; srcPlugin = fetchurl { url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse_${version}.jar"; - sha1 = "0c80c2e228a07f18efab1c56ea026448eda70c06"; + hash = "sha256-lhwFwdMDwCIUrQjdWfe5ZSutCIsKtZSBT6FWthUipdk="; }; meta = with lib; { @@ -695,12 +695,12 @@ rec { srcFeature = fetchurl { url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_${version}.jar"; - sha1 = "fb1941eaa2c0de54259de01b0da6d5a6b4a2cab1"; + hash = "sha256-PSH5NtE7hN2hHoHUhVK1CLkHN7YSDdTTqBP7711X4rU="; }; srcPlugin = fetchurl { url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse.resolvevisualizer_${version}.jar"; - sha1 = "225e0c8ccb010d622c159560638578c2fc51a67e"; + hash = "sha256-qjTvn1j7viSfzLkWnYjyS9Pj2ExqsiFGLzot3+oB0Tw="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/editors/edbrowse/default.nix b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix index 5b37b86556b7..0f51e016c0ea 100644 --- a/nixpkgs/pkgs/applications/editors/edbrowse/default.nix +++ b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { license = licenses.gpl1Plus; maintainers = with maintainers; [ schmitthenner vrthra equirosa ]; platforms = platforms.linux; + mainProgram = "edbrowse"; }; } # TODO: send the patch to upstream developers diff --git a/nixpkgs/pkgs/applications/editors/edit/default.nix b/nixpkgs/pkgs/applications/editors/edit/default.nix index 6ea90b0b8a81..192aa903f3e9 100644 --- a/nixpkgs/pkgs/applications/editors/edit/default.nix +++ b/nixpkgs/pkgs/applications/editors/edit/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation { license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; platforms = lib.platforms.unix; + mainProgram = "edit"; }; } diff --git a/nixpkgs/pkgs/applications/editors/edlin/default.nix b/nixpkgs/pkgs/applications/editors/edlin/default.nix index 9de4f8d4a8c7..f8baa9aa67bc 100644 --- a/nixpkgs/pkgs/applications/editors/edlin/default.nix +++ b/nixpkgs/pkgs/applications/editors/edlin/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "edlin"; }; }) diff --git a/nixpkgs/pkgs/applications/editors/edwood/default.nix b/nixpkgs/pkgs/applications/editors/edwood/default.nix index 8dfa36398bfd..fc32c5ed3937 100644 --- a/nixpkgs/pkgs/applications/editors/edwood/default.nix +++ b/nixpkgs/pkgs/applications/editors/edwood/default.nix @@ -43,5 +43,6 @@ buildGoModule rec { homepage = "https://github.com/rjkroege/edwood"; license = with licenses; [ mit bsd3 ]; maintainers = with maintainers; [ kranzes ]; + mainProgram = "edwood"; }; } diff --git a/nixpkgs/pkgs/applications/editors/em/default.nix b/nixpkgs/pkgs/applications/editors/em/default.nix index 89cc795f5674..89da2d719fa8 100644 --- a/nixpkgs/pkgs/applications/editors/em/default.nix +++ b/nixpkgs/pkgs/applications/editors/em/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.publicDomain; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "em"; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index ff5cce83103e..60c257e365ce 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -64,6 +64,10 @@ self: let ''; }); + pq = super.pq.overrideAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ]; + }); + xeft = super.xeft.overrideAttrs (old: let libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 84c991ad17c2..2a6cb016cdc8 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -98,7 +98,7 @@ self: let ''; postInstall = (old.postInstall or "") + "\n" + '' - ./install.sh --prefix=$out + ./install.sh "$out" ''; meta = old.meta // { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 117adcd47a9c..d53ee7056a89 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -93,6 +93,8 @@ in wat-mode = callPackage ./manual-packages/wat-mode { }; + xapian-lite = callPackage ./manual-packages/xapian-lite { }; + yes-no = callPackage ./manual-packages/yes-no { }; youtube-dl = callPackage ./manual-packages/youtube-dl { }; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix index 26f9e25ad665..02fec5ef7f72 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix @@ -7,7 +7,7 @@ trivialBuild { inherit (llvmPackages.llvm) src version; postUnpack = '' - sourceRoot="$sourceRoot/utils/emacs" + sourceRoot="$sourceRoot/llvm/utils/emacs" ''; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix new file mode 100644 index 000000000000..67b5a96ee9c0 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, emacs, fetchFromSourcehut, xapian }: + +stdenv.mkDerivation (finalAttrs: { + pname = "xapian-lite"; + version = "2.0.0"; + + src = fetchFromSourcehut { + owner = "~casouri"; + repo = "xapian-lite"; + rev = "v${finalAttrs.version}"; + hash = "sha256-uFO5yxPHIUJjT3OV2hZKp7KgT3l73W95X2SAz6vhCpI="; + domain = "sr.ht"; + }; + + preBuild = '' + rm emacs-module.h + ''; + + buildInputs = [ xapian emacs ]; + + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/share/emacs/site-lisp/ xapian-lite${stdenv.targetPlatform.extensions.sharedLibrary} + + runHook postInstall + ''; + + meta = { + homepage = "https://git.sr.ht/~casouri/xapian-lite"; + description = "A minimal Emacs dynamic module for Xapian"; + maintainers = [ lib.maintainers.marsam ]; + license = lib.licenses.gpl3Plus; + inherit (emacs.meta) platforms; + }; +}) diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index cd45cfc78727..3c8f89bd44d6 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -281,6 +281,20 @@ let packageRequires = [ self.haskell-mode ]; }); + hotfuzz = super.hotfuzz.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; + + dontUseCmakeBuildDir = true; + + preBuild = '' + make -j$NIX_BUILD_CORES + ''; + + postInstall = (old.postInstall or "") + "\n" + '' + install source/hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-* + ''; + }); + irony = super.irony.overrideAttrs (old: { cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; diff --git a/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix b/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix index 789420fdfc6e..5625dfbb3aa9 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix @@ -61,11 +61,7 @@ , wrapGAppsHook # Boolean flags -, nativeComp ? null -, withNativeCompilation ? - if nativeComp != null - then lib.warn "nativeComp option is deprecated and will be removed; use withNativeCompilation instead" nativeComp - else stdenv.buildPlatform.canExecute stdenv.hostPlatform +, withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , noGui ? false , srcRepo ? true , withAcl ? false @@ -403,9 +399,6 @@ mkDerivation (finalAttrs: { inherit withTreeSitter; pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); tests = { inherit (nixosTests) emacs-daemon; }; - # Backwards compatibility aliases. Remove this at some point before 23.11 release cut-off. - nativeComp = builtins.trace "emacs.passthru: nativeComp was renamed to withNativeCompilation and will be removed in 23.11" withNativeCompilation; - treeSitter = builtins.trace "emacs.passthru: treeSitter was renamed to withTreeSitter and will be removed in 23.11" withTreeSitter; }; meta = meta // { diff --git a/nixpkgs/pkgs/applications/editors/flpsed/default.nix b/nixpkgs/pkgs/applications/editors/flpsed/default.nix index bffa50643899..ae541b8dd768 100644 --- a/nixpkgs/pkgs/applications/editors/flpsed/default.nix +++ b/nixpkgs/pkgs/applications/editors/flpsed/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "flpsed"; }; } diff --git a/nixpkgs/pkgs/applications/editors/focuswriter/default.nix b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix index de008a54513a..f2b422d8cbf7 100644 --- a/nixpkgs/pkgs/applications/editors/focuswriter/default.nix +++ b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ madjar kashw2 ]; platforms = platforms.linux; homepage = "https://gottcode.org/focuswriter/"; + mainProgram = "focuswriter"; }; } diff --git a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 09684c7359f1..fc3f3fd27474 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -19,8 +19,9 @@ , libadwaita , libdex , libpanel -, libpeas +, libpeas2 , libportal-gtk4 +, libsysprof-capture , libxml2 , meson , ninja @@ -41,13 +42,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "44.2"; + version = "45.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z6aJx40/AiMcp0cVV99MZIKASio08nHDXRqWLX8XKbA="; + sha256 = "JC2gJZMpPUVuokEIpFk0cwoeMW2NxbGNnfDoZNt7pZY="; }; patches = [ @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { editorconfig-core-c flatpak libgit2-glib - libpeas + libpeas2 libportal-gtk4 vte-gtk4 enchant @@ -94,12 +95,12 @@ stdenv.mkDerivation rec { libadwaita libdex libpanel + libsysprof-capture libxml2 ostree d-spy pcre2 python3 - sysprof template-glib vala webkitgtk_6_0 @@ -142,6 +143,8 @@ stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( --prefix PYTHONPATH : "$program_PYTHONPATH" + # For sysprof-agent + --prefix PATH : "${sysprof}/bin" ) # Ensure that all plugins get their interpreter paths fixed up. @@ -175,5 +178,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; + mainProgram = "gnome-builder"; }; } diff --git a/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix b/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix index 3b73e0843d92..cab490cd76e4 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix @@ -113,5 +113,6 @@ in stdenv.mkDerivation { license = licenses.gpl3Only; maintainers = [ maintainers.fitzgibbon ]; platforms = platforms.linux; + mainProgram = "gnome-inform7"; }; } diff --git a/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix b/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix index e0b7bc9524fd..90b145c50330 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.manveru ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "gnome-latex"; }; } diff --git a/nixpkgs/pkgs/applications/editors/gophernotes/default.nix b/nixpkgs/pkgs/applications/editors/gophernotes/default.nix index 3ed0b67741af..9e6ebb47f966 100644 --- a/nixpkgs/pkgs/applications/editors/gophernotes/default.nix +++ b/nixpkgs/pkgs/applications/editors/gophernotes/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/gopherdata/gophernotes"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; + mainProgram = "gophernotes"; }; } diff --git a/nixpkgs/pkgs/applications/editors/hecate/default.nix b/nixpkgs/pkgs/applications/editors/hecate/default.nix index a2bb4e84c999..a3e8726b13ec 100644 --- a/nixpkgs/pkgs/applications/editors/hecate/default.nix +++ b/nixpkgs/pkgs/applications/editors/hecate/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { longDescription = "The Hex Editor From Hell!"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ramkromberg ]; + mainProgram = "hecate"; }; } diff --git a/nixpkgs/pkgs/applications/editors/heh/default.nix b/nixpkgs/pkgs/applications/editors/heh/default.nix index ca044168b845..a3ad923ef561 100644 --- a/nixpkgs/pkgs/applications/editors/heh/default.nix +++ b/nixpkgs/pkgs/applications/editors/heh/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ piturnah ]; + mainProgram = "heh"; }; } diff --git a/nixpkgs/pkgs/applications/editors/hexcurse/default.nix b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix index 1c2e09695e5e..17291a458a4b 100644 --- a/nixpkgs/pkgs/applications/editors/hexcurse/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "hexcurse"; }; } diff --git a/nixpkgs/pkgs/applications/editors/hexdino/default.nix b/nixpkgs/pkgs/applications/editors/hexdino/default.nix index 5eb023f8b9ed..8ebd84cf248d 100644 --- a/nixpkgs/pkgs/applications/editors/hexdino/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexdino/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Luz/hexdino"; license = licenses.mit; maintainers = [ maintainers.luz ]; + mainProgram = "hexdino"; }; } diff --git a/nixpkgs/pkgs/applications/editors/hexedit/default.nix b/nixpkgs/pkgs/applications/editors/hexedit/default.nix index 238bc905f713..7f32835fdc84 100644 --- a/nixpkgs/pkgs/applications/editors/hexedit/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexedit/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ delroth ]; + mainProgram = "hexedit"; }; } diff --git a/nixpkgs/pkgs/applications/editors/ht/default.nix b/nixpkgs/pkgs/applications/editors/ht/default.nix index c8a13738c910..363466e160d0 100644 --- a/nixpkgs/pkgs/applications/editors/ht/default.nix +++ b/nixpkgs/pkgs/applications/editors/ht/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "ht"; }; } diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/coq/default.nix b/nixpkgs/pkgs/applications/editors/jupyter-kernels/coq/default.nix new file mode 100644 index 000000000000..545c4e8ec4e8 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/coq/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, callPackage +, runCommand +, makeWrapper +, coq +, imagemagick +, python3 +}: + +# Jupyter console: +# nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel coq-kernel.definition' + +# Jupyter console with packages: +# nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel (coq-kernel.definitionWithPackages [coqPackages.bignums])' + +# Jupyter notebook: +# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.coq = coq-kernel.definition; }' + +let + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel (callPackage ./kernel.nix {}) ]); + + logos = runCommand "coq-logos" { buildInputs = [ imagemagick ]; } '' + mkdir -p $out + convert ${coq.src}/ide/coqide/coq.png -resize 32x32 $out/logo-32x32.png + convert ${coq.src}/ide/coqide/coq.png -resize 64x64 $out/logo-64x64.png + ''; + +in + +rec { + launcher = runCommand "coq-kernel-launcher" { + nativeBuildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + + makeWrapper ${python.interpreter} $out/bin/coq-kernel \ + --add-flags "-m coq_jupyter" \ + --suffix PATH : ${coq}/bin + ''; + + definition = definitionWithPackages []; + + definitionWithPackages = packages: { + displayName = "Coq " + coq.version; + argv = [ + "${launcher}/bin/coq-kernel" + "-f" + "{connection_file}" + ]; + language = "coq"; + logo32 = "${logos}/logo-32x32.png"; + logo64 = "${logos}/logo-64x64.png"; + env = { + COQPATH = lib.concatStringsSep ":" (map (x: "${x}/lib/coq/${coq.coq-version}/user-contrib/") packages); + }; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix b/nixpkgs/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix new file mode 100644 index 000000000000..78bf84716fef --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, python3 +, coq +}: + +python3.pkgs.buildPythonPackage rec { + pname = "coq-jupyter"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "EugeneLoy"; + repo = "coq_jupyter"; + rev = "v${version}"; + sha256 = "sha256-+Pp51cxeqjg5MW4CEccNWVjNcY9iyFNATIEage9RWJ0="; + }; + + propagatedBuildInputs = (with python3.pkgs; [ ipykernel future ]) ++ [ coq ]; + + nativeBuildInputs = [ coq ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/EugeneLoy/coq_jupyter"; + description = "Jupyter kernel for Coq"; + license = licenses.asl20; + maintainers = with maintainers; [ thomasjm ]; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/0001-Fix-bug-in-extract_filename.patch b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/0001-Fix-bug-in-extract_filename.patch new file mode 100644 index 000000000000..dac0825b01a1 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/0001-Fix-bug-in-extract_filename.patch @@ -0,0 +1,50 @@ +From 8bfa594bc37630956f80496106bb1d6070035570 Mon Sep 17 00:00:00 2001 +From: thomasjm <tom@codedown.io> +Date: Wed, 2 Aug 2023 18:26:58 -0700 +Subject: [PATCH 1/3] Fix bug in extract_filename + +--- + src/main.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index 2ee19be..57294b4 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -61,19 +61,19 @@ bool should_print_version(int argc, char* argv[]) + return false; + } + +-std::string extract_filename(int argc, char* argv[]) ++std::string extract_filename(int *argc, char* argv[]) + { + std::string res = ""; +- for (int i = 0; i < argc; ++i) ++ for (int i = 0; i < *argc; ++i) + { +- if ((std::string(argv[i]) == "-f") && (i + 1 < argc)) ++ if ((std::string(argv[i]) == "-f") && (i + 1 < *argc)) + { + res = argv[i + 1]; +- for (int j = i; j < argc - 2; ++j) ++ for (int j = i; j < *argc - 2; ++j) + { + argv[j] = argv[j + 2]; + } +- argc -= 2; ++ *argc -= 2; + break; + } + } +@@ -128,7 +128,7 @@ int main(int argc, char* argv[]) + #endif + signal(SIGINT, stop_handler); + +- std::string file_name = extract_filename(argc, argv); ++ std::string file_name = extract_filename(&argc, argv); + + interpreter_ptr interpreter = build_interpreter(argc, argv); + +-- +2.40.1 + diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/0002-Don-t-pass-extra-includes-configure-this-with-flags.patch b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/0002-Don-t-pass-extra-includes-configure-this-with-flags.patch new file mode 100644 index 000000000000..c07e57dfe85d --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/0002-Don-t-pass-extra-includes-configure-this-with-flags.patch @@ -0,0 +1,34 @@ +From 9e6a14bb20567071883563dafb5dfaf512df6243 Mon Sep 17 00:00:00 2001 +From: thomasjm <tom@codedown.io> +Date: Wed, 2 Aug 2023 18:27:16 -0700 +Subject: [PATCH 2/3] Don't pass extra includes; configure this with flags + +--- + src/main.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index 57294b4..0041a55 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -84,7 +84,7 @@ using interpreter_ptr = std::unique_ptr<xcpp::interpreter>; + + interpreter_ptr build_interpreter(int argc, char** argv) + { +- int interpreter_argc = argc + 1; ++ int interpreter_argc = argc; + const char** interpreter_argv = new const char*[interpreter_argc]; + interpreter_argv[0] = "xeus-cling"; + // Copy all arguments in the new array excepting the process name. +@@ -92,8 +92,6 @@ interpreter_ptr build_interpreter(int argc, char** argv) + { + interpreter_argv[i] = argv[i]; + } +- std::string include_dir = std::string(LLVM_DIR) + std::string("/include"); +- interpreter_argv[interpreter_argc - 1] = include_dir.c_str(); + + interpreter_ptr interp_ptr = interpreter_ptr(new xcpp::interpreter(interpreter_argc, interpreter_argv)); + delete[] interpreter_argv; +-- +2.40.1 + diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix new file mode 100644 index 000000000000..069e70b4253f --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix @@ -0,0 +1,63 @@ +{ callPackage +, clangStdenv +, cling +, fetchurl +, lib +, llvmPackages_9 +, makeWrapper +, runCommand +, stdenv +}: + +# Jupyter console: +# nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel cpp17-kernel' + +# Jupyter notebook: +# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions = { cpp17 = cpp17-kernel; }; }' + +let + xeus-cling = callPackage ./xeus-cling.nix {}; + + mkDefinition = std: + let + versionSuffix = + if std == "c++11" then " 11" + else if std == "c++14" then " 14" + else if std == "c++17" then " 17" + else if std == "c++17" then " 17" + else if std == "c++2a" then " 2a" + else throw "Unexpected C++ std for cling: ${std}"; + in + { + displayName = "C++" + versionSuffix; + argv = [ + "${xeus-cling}/bin/xcpp" + ] + ++ cling.flags + ++ [ + "-resource-dir" "${cling.unwrapped}" + "-L" "${cling.unwrapped}/lib" + "-l" "${cling.unwrapped}/lib/cling.so" + "-std=${std}" + # "-v" + "-f" "{connection_file}" + ]; + language = "cpp"; + logo32 = fetchurl { + url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/ISO_C%2B%2B_Logo.svg/32px-ISO_C%2B%2B_Logo.svg.png"; + hash = "sha256-cr0TB8/j2mkcFhfCkz9F7ZANOuTlWA2OcWtDcXyOjHw="; + }; + logo64 = fetchurl { + url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/ISO_C%2B%2B_Logo.svg/64px-ISO_C%2B%2B_Logo.svg.png"; + hash = "sha256-nZtJ4bR7GmQttvqEJC9KejOxphrjjxT36L9yOIITFLk="; + }; + }; + +in + +{ + cpp11-kernel = mkDefinition "c++11"; + cpp14-kernel = mkDefinition "c++14"; + cpp17-kernel = mkDefinition "c++17"; + cpp2a-kernel = mkDefinition "c++2a"; +} diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix new file mode 100644 index 000000000000..f223043ca3b6 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -0,0 +1,87 @@ +{ lib +, callPackage +, clangStdenv +, cmake +, fetchFromGitHub +, gcc +, git +, llvmPackages_9 +# Libraries +, argparse +, cling +, cppzmq +, libuuid +, ncurses +, openssl +, pugixml +, xeus +, xeus-zmq +, xtl +, zeromq +, zlib +# Settings +, debug ? false +}: + +let + # Nixpkgs moved to argparse 3.x, but we need ~2.9 + argparse_2_9 = argparse.overrideAttrs (oldAttrs: { + version = "2.9"; + + src = fetchFromGitHub { + owner = "p-ranav"; + repo = "argparse"; + rev = "v2.9"; + sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E="; + }; + }); + +in + +clangStdenv.mkDerivation rec { + pname = "xeus-cling"; + version = "0.15.3"; + + src = fetchFromGitHub { + owner = "QuantStack"; + repo = "xeus-cling"; + rev = "${version}"; + hash = "sha256-OfZU+z+p3/a36GntusBfwfFu3ssJW4Fu7SV3SMCoo1I="; + }; + + patches = [ + ./0001-Fix-bug-in-extract_filename.patch + ./0002-Don-t-pass-extra-includes-configure-this-with-flags.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + argparse_2_9 + cling.unwrapped + cppzmq + libuuid + llvmPackages_9.llvm + ncurses + openssl + pugixml + xeus + xeus-zmq + xtl + zeromq + zlib + ]; + + cmakeFlags = lib.optionals debug [ + "-DCMAKE_BUILD_TYPE=Debug" + ]; + + dontStrip = debug; + + meta = { + description = "Jupyter kernel for the C++ programming language"; + homepage = "https://github.com/jupyter-xeus/xeus-cling"; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/jupyter/default.nix b/nixpkgs/pkgs/applications/editors/jupyter/default.nix index 2bca120c1deb..57122d173a44 100644 --- a/nixpkgs/pkgs/applications/editors/jupyter/default.nix +++ b/nixpkgs/pkgs/applications/editors/jupyter/default.nix @@ -6,13 +6,13 @@ }: let - jupyterPath = (jupyter-kernel.create { inherit definitions; }); - + jupyter-notebook = (python3.buildEnv.override { + extraLibs = [ python3.pkgs.notebook ]; + makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; + }).overrideAttrs(oldAttrs: { + meta = oldAttrs.meta // { mainProgram = "jupyter-notebook"; }; + }); in -with python3.pkgs; toPythonModule ( - notebook.overridePythonAttrs(oldAttrs: { - makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; - }) -) +jupyter-notebook diff --git a/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 5ca75e76cdf4..fa0e485d7128 100644 --- a/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; @@ -9,6 +9,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo="; }; + patches = [ + # Use explicit target types for gather calls to bypass clang regression + # + # Since clang-16 there has been a regression in the P0522R0 support. + # (Bug report at https://github.com/llvm/llvm-project/issue/63281) + # + # Closes mawww/kakoune#4892 + (fetchpatch { + url = "https://github.com/mawww/kakoune/commit/7577fa1b668ea81eb9b7b9af690a4161187129dd.patch"; + hash = "sha256-M0jKaEDhkpvX+n7k8Jf2lWaRNy8bqZ1kRHR4eG4npss="; + }) + ]; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/editors/kibi/default.nix b/nixpkgs/pkgs/applications/editors/kibi/default.nix index 3d1f01f4b021..a5056575fa4a 100644 --- a/nixpkgs/pkgs/applications/editors/kibi/default.nix +++ b/nixpkgs/pkgs/applications/editors/kibi/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ilai-deutel/kibi"; license = licenses.mit; maintainers = with maintainers; [ robertodr ]; + mainProgram = "kibi"; }; } diff --git a/nixpkgs/pkgs/applications/editors/kile/default.nix b/nixpkgs/pkgs/applications/editors/kile/default.nix index 686113452eb8..0e1326f50c49 100644 --- a/nixpkgs/pkgs/applications/editors/kile/default.nix +++ b/nixpkgs/pkgs/applications/editors/kile/default.nix @@ -64,5 +64,6 @@ mkDerivation rec { homepage = "https://www.kde.org/applications/office/kile/"; maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2Plus; + mainProgram = "kile"; }; } diff --git a/nixpkgs/pkgs/applications/editors/l3afpad/default.nix b/nixpkgs/pkgs/applications/editors/l3afpad/default.nix index 2ccea6afc3ee..2caf4ee781e2 100644 --- a/nixpkgs/pkgs/applications/editors/l3afpad/default.nix +++ b/nixpkgs/pkgs/applications/editors/l3afpad/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ ckie ]; license = licenses.gpl2; + mainProgram = "l3afpad"; }; } diff --git a/nixpkgs/pkgs/applications/editors/ldtk/default.nix b/nixpkgs/pkgs/applications/editors/ldtk/default.nix index a9688241ab1d..337bc3bc6dfa 100644 --- a/nixpkgs/pkgs/applications/editors/ldtk/default.nix +++ b/nixpkgs/pkgs/applications/editors/ldtk/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ felschr ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; + mainProgram = "ldtk"; }; }) diff --git a/nixpkgs/pkgs/applications/editors/leafpad/default.nix b/nixpkgs/pkgs/applications/editors/leafpad/default.nix index d0b38bcd35a8..b02067a2113e 100644 --- a/nixpkgs/pkgs/applications/editors/leafpad/default.nix +++ b/nixpkgs/pkgs/applications/editors/leafpad/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.flosse ]; license = licenses.gpl3; + mainProgram = "leafpad"; }; } diff --git a/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix index d029145934af..94d554abd591 100644 --- a/nixpkgs/pkgs/applications/editors/leo-editor/default.nix +++ b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.7.4"; + version = "6.7.5"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-YKK46PeCMOTNOTpMrIgem+Au70Xj+tTHxOhC8alF3ms="; + sha256 = "sha256-Y0g4mpEf4+hApHFHaqB8esVep2OyqWLo7YGLf/7eCYg="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/applications/editors/lite-xl/default.nix b/nixpkgs/pkgs/applications/editors/lite-xl/default.nix index 857bc35309f2..d74c5a213532 100644 --- a/nixpkgs/pkgs/applications/editors/lite-xl/default.nix +++ b/nixpkgs/pkgs/applications/editors/lite-xl/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ sefidel ]; platforms = platforms.unix; + mainProgram = "lite-xl"; }; } diff --git a/nixpkgs/pkgs/applications/editors/lite/default.nix b/nixpkgs/pkgs/applications/editors/lite/default.nix index 5ed1603ba8a8..77f3a38bc6c5 100644 --- a/nixpkgs/pkgs/applications/editors/lite/default.nix +++ b/nixpkgs/pkgs/applications/editors/lite/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; + mainProgram = "lite"; }; } diff --git a/nixpkgs/pkgs/applications/editors/manuskript/default.nix b/nixpkgs/pkgs/applications/editors/manuskript/default.nix index c93ba5ed8874..645883f5489f 100644 --- a/nixpkgs/pkgs/applications/editors/manuskript/default.nix +++ b/nixpkgs/pkgs/applications/editors/manuskript/default.nix @@ -58,5 +58,6 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3; maintainers = [ ]; platforms = lib.platforms.unix; + mainProgram = "manuskript"; }; } diff --git a/nixpkgs/pkgs/applications/editors/marker/default.nix b/nixpkgs/pkgs/applications/editors/marker/default.nix index dcfe3d8ed35f..f24f83c70f27 100644 --- a/nixpkgs/pkgs/applications/editors/marker/default.nix +++ b/nixpkgs/pkgs/applications/editors/marker/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}"; + mainProgram = "marker"; }; } diff --git a/nixpkgs/pkgs/applications/editors/micro/default.nix b/nixpkgs/pkgs/applications/editors/micro/default.nix index 964c81a6c424..31ac4567b61f 100644 --- a/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "micro"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - hash = "sha256-L8yJE3rjNcx+1gawQ8urZcFfoQdO20E67mJQjWaVwVo="; + hash = "sha256-fe+7RkUwCveBk14bYzg5uLGOqTVVJsrqixBQhCS79hY="; }; - vendorHash = "sha256-h00s+xqepj+odKAgf54s35xMnnj3gtx5LWDOYFx5GY0="; + vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y="; nativeBuildInputs = [ installShellFiles ]; @@ -30,7 +30,7 @@ buildGoModule rec { postInstall = '' installManPage assets/packaging/micro.1 - install -Dt $out/share/applications assets/packaging/micro.desktop + install -Dm444 -t $out/share/applications assets/packaging/micro.desktop install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg ''; diff --git a/nixpkgs/pkgs/applications/editors/mindforger/default.nix b/nixpkgs/pkgs/applications/editors/mindforger/default.nix index 2f75fb34cd18..de304cd6208a 100644 --- a/nixpkgs/pkgs/applications/editors/mindforger/default.nix +++ b/nixpkgs/pkgs/applications/editors/mindforger/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ cyplo ]; + mainProgram = "mindforger"; }; } diff --git a/nixpkgs/pkgs/applications/editors/mle/default.nix b/nixpkgs/pkgs/applications/editors/mle/default.nix index 088f10a9e976..079c24c2e732 100644 --- a/nixpkgs/pkgs/applications/editors/mle/default.nix +++ b/nixpkgs/pkgs/applications/editors/mle/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ adsr ]; + mainProgram = "mle"; }; } diff --git a/nixpkgs/pkgs/applications/editors/moe/default.nix b/nixpkgs/pkgs/applications/editors/moe/default.nix index 71449a0b8a80..9d0724f1997b 100644 --- a/nixpkgs/pkgs/applications/editors/moe/default.nix +++ b/nixpkgs/pkgs/applications/editors/moe/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; + mainProgram = "moe"; }; }) # TODO: a configurable, global moerc file diff --git a/nixpkgs/pkgs/applications/editors/molsketch/default.nix b/nixpkgs/pkgs/applications/editors/molsketch/default.nix index aa336ce45e21..6a656114ff5f 100644 --- a/nixpkgs/pkgs/applications/editors/molsketch/default.nix +++ b/nixpkgs/pkgs/applications/editors/molsketch/default.nix @@ -49,5 +49,6 @@ mkDerivation rec { homepage = "https://sourceforge.net/projects/molsketch/"; license = licenses.gpl2Plus; maintainers = [ maintainers.moni ]; + mainProgram = "molsketch"; }; } diff --git a/nixpkgs/pkgs/applications/editors/ne/default.nix b/nixpkgs/pkgs/applications/editors/ne/default.nix index e246185e2a19..017354222e82 100644 --- a/nixpkgs/pkgs/applications/editors/ne/default.nix +++ b/nixpkgs/pkgs/applications/editors/ne/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ geri1701 ]; + mainProgram = "ne"; }; } diff --git a/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/nixpkgs/pkgs/applications/editors/netbeans/default.nix index c2b1d627496f..a2d7f13338a9 100644 --- a/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation { ]; maintainers = with lib.maintainers; [ sander rszibele kashw2 ]; platforms = lib.platforms.unix; + mainProgram = "netbeans"; }; } diff --git a/nixpkgs/pkgs/applications/editors/notepad-next/default.nix b/nixpkgs/pkgs/applications/editors/notepad-next/default.nix index c2085bcf0455..2f668a6fc526 100644 --- a/nixpkgs/pkgs/applications/editors/notepad-next/default.nix +++ b/nixpkgs/pkgs/applications/editors/notepad-next/default.nix @@ -39,5 +39,6 @@ mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.sebtm ]; broken = stdenv.isAarch64; + mainProgram = "NotepadNext"; }; } diff --git a/nixpkgs/pkgs/applications/editors/notepadqq/default.nix b/nixpkgs/pkgs/applications/editors/notepadqq/default.nix index 3aa08559bdf7..56de0b332a55 100644 --- a/nixpkgs/pkgs/applications/editors/notepadqq/default.nix +++ b/nixpkgs/pkgs/applications/editors/notepadqq/default.nix @@ -55,5 +55,6 @@ mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.rszibele ]; + mainProgram = "notepadqq"; }; } diff --git a/nixpkgs/pkgs/applications/editors/nvpy/default.nix b/nixpkgs/pkgs/applications/editors/nvpy/default.nix index cc5f60984c93..5532bd8524da 100644 --- a/nixpkgs/pkgs/applications/editors/nvpy/default.nix +++ b/nixpkgs/pkgs/applications/editors/nvpy/default.nix @@ -37,5 +37,6 @@ in pythonPackages.buildPythonApplication rec { homepage = "https://github.com/cpbotha/nvpy"; platforms = platforms.linux; license = licenses.bsd3; + mainProgram = "nvpy"; }; } diff --git a/nixpkgs/pkgs/applications/editors/openvi/default.nix b/nixpkgs/pkgs/applications/editors/openvi/default.nix index 54a57d949eff..63ba5690df23 100644 --- a/nixpkgs/pkgs/applications/editors/openvi/default.nix +++ b/nixpkgs/pkgs/applications/editors/openvi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "openvi"; - version = "7.4.26"; + version = "7.4.27"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-Fgsw4ovq7PXqPF5ECVFJulrcHdsbRQsvy62DAr4RRr4="; + hash = "sha256-3cqe6woJvJt0ckI3aOhF0gARKy8VMCfWxIiiglkHBTo="; }; buildInputs = [ ncurses perl ]; diff --git a/nixpkgs/pkgs/applications/editors/orbiton/default.nix b/nixpkgs/pkgs/applications/editors/orbiton/default.nix index a4822d431543..1b3e96a45113 100644 --- a/nixpkgs/pkgs/applications/editors/orbiton/default.nix +++ b/nixpkgs/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.65.2"; + version = "2.65.6"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-wuRbn3zQlyqba21tKLVCRfs8QgreWQ+FBFDw6myoYbk="; + hash = "sha256-HJ1smXLycxcII6FjvXCvxipm7G+2SVweOMPwJ3aJxMg="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/editors/ox/default.nix b/nixpkgs/pkgs/applications/editors/ox/default.nix index 2e67e83e972b..24ce2cec46df 100644 --- a/nixpkgs/pkgs/applications/editors/ox/default.nix +++ b/nixpkgs/pkgs/applications/editors/ox/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ moni ]; + mainProgram = "ox"; }; } diff --git a/nixpkgs/pkgs/applications/editors/pinegrow/default.nix b/nixpkgs/pkgs/applications/editors/pinegrow/default.nix index b4555bc89878..cf5d35c1c296 100644 --- a/nixpkgs/pkgs/applications/editors/pinegrow/default.nix +++ b/nixpkgs/pkgs/applications/editors/pinegrow/default.nix @@ -97,5 +97,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ unfreeRedistributable ]; maintainers = with maintainers; [ gador ]; + mainProgram = "pinegrow"; }; } diff --git a/nixpkgs/pkgs/applications/editors/pixelorama/default.nix b/nixpkgs/pkgs/applications/editors/pixelorama/default.nix index 65e724df3db9..f80e01e1e18e 100644 --- a/nixpkgs/pkgs/applications/editors/pixelorama/default.nix +++ b/nixpkgs/pkgs/applications/editors/pixelorama/default.nix @@ -90,5 +90,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ felschr ]; + mainProgram = "pixelorama"; }; }) diff --git a/nixpkgs/pkgs/applications/editors/qxmledit/default.nix b/nixpkgs/pkgs/applications/editors/qxmledit/default.nix index bbb8d39a5f7a..1991b2a7bc77 100644 --- a/nixpkgs/pkgs/applications/editors/qxmledit/default.nix +++ b/nixpkgs/pkgs/applications/editors/qxmledit/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; platforms = platforms.unix; changelog = "https://github.com/lbellonda/qxmledit/blob/${version}/NEWS"; + mainProgram = "qxmledit"; }; } diff --git a/nixpkgs/pkgs/applications/editors/qxw/default.nix b/nixpkgs/pkgs/applications/editors/qxw/default.nix index c36aba6d9bba..2d2af2ce508e 100644 --- a/nixpkgs/pkgs/applications/editors/qxw/default.nix +++ b/nixpkgs/pkgs/applications/editors/qxw/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.tckmn ]; platforms = platforms.linux; + mainProgram = "qxw"; }; } diff --git a/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index abbfefce5293..545e82cf6de9 100644 --- a/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -36,5 +36,6 @@ buildPythonApplication rec { description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej ]; + mainProgram = "rednotebook"; }; } diff --git a/nixpkgs/pkgs/applications/editors/rehex/default.nix b/nixpkgs/pkgs/applications/editors/rehex/default.nix index 0d4d171d9828..bc2bc733c6c0 100644 --- a/nixpkgs/pkgs/applications/editors/rehex/default.nix +++ b/nixpkgs/pkgs/applications/editors/rehex/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ markus1189 wegank ]; platforms = platforms.all; + mainProgram = "rehex"; }; } diff --git a/nixpkgs/pkgs/applications/editors/retext/default.nix b/nixpkgs/pkgs/applications/editors/retext/default.nix index 574d83f1be97..feb42d9a99a9 100644 --- a/nixpkgs/pkgs/applications/editors/retext/default.nix +++ b/nixpkgs/pkgs/applications/editors/retext/default.nix @@ -88,5 +88,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ klntsky ]; platforms = platforms.unix; + mainProgram = "retext"; }; } diff --git a/nixpkgs/pkgs/applications/editors/scite/default.nix b/nixpkgs/pkgs/applications/editors/scite/default.nix index 4118aee8a2dd..67ebd13134b2 100644 --- a/nixpkgs/pkgs/applications/editors/scite/default.nix +++ b/nixpkgs/pkgs/applications/editors/scite/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.rszibele ]; + mainProgram = "SciTE"; }; } diff --git a/nixpkgs/pkgs/applications/editors/setzer/default.nix b/nixpkgs/pkgs/applications/editors/setzer/default.nix index 8da51bd97a62..bd69a865be0e 100644 --- a/nixpkgs/pkgs/applications/editors/setzer/default.nix +++ b/nixpkgs/pkgs/applications/editors/setzer/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "61"; + version = "62"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-7qkQelB0Y+DBihhaYVVQjK66pk8p2Sjhno87bW554SY="; + hash = "sha256-CynYWzFnsr5FoNwBlK4k8c+EE22NP0OrpEFrSiEtxUU="; }; format = "other"; diff --git a/nixpkgs/pkgs/applications/editors/sigil/default.nix b/nixpkgs/pkgs/applications/editors/sigil/default.nix index 1740d5a8e374..022e9ec69720 100644 --- a/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -41,5 +41,6 @@ mkDerivation rec { license = licenses.gpl3; # currently unmaintained platforms = platforms.linux; + mainProgram = "sigil"; }; } diff --git a/nixpkgs/pkgs/applications/editors/spacevim/default.nix b/nixpkgs/pkgs/applications/editors/spacevim/default.nix index 8252f8ce1c14..3db7c73fd422 100644 --- a/nixpkgs/pkgs/applications/editors/spacevim/default.nix +++ b/nixpkgs/pkgs/applications/editors/spacevim/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.fzakaria ]; platforms = platforms.all; + mainProgram = "spacevim"; }; } diff --git a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index 6e4354612e3f..e3348ceebfd7 100644 --- a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mgregoire chuangzhu squalus ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; platforms = builtins.attrNames srcjson.deb; + mainProgram = "standardnotes"; }; } diff --git a/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix b/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix index ac64c8eac9bc..d583467ad832 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix @@ -5,15 +5,15 @@ let in { sublime4 = common { - buildVersion = "4152"; - x64sha256 = "bt48g1GZWYlwQcZQboUHU8GZYmA7cb2fc6Ylrh5NNVQ="; - aarch64sha256 = "nSH5a5KRYzqLMnLo2mFk3WpjL9p6Qh3zNy8oFPEHHoA="; + buildVersion = "4169"; + x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; + aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; } {}; sublime4-dev = common { - buildVersion = "4155"; + buildVersion = "4168"; dev = true; - x64sha256 = "owcux1/CjXQsJ8/6ex3CWV1/Wvh/ofZFH7yNQtxl9d4="; - aarch64sha256 = "YAcdpBDmaajQPvyp8ypJNom+XOKx2YKA2uylfxlKuZY="; + x64sha256 = "KfW1Mh78CUBTmthHQd1s15a7GrmssSnWZ1RgaarJeag="; + aarch64sha256 = "qJ9oix1kwWN+TUb5/WSKyHcHzB+Q87XolMOhmqx1OFc="; } {}; } diff --git a/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/nixpkgs/pkgs/applications/editors/texmaker/default.nix index 3cec9808ed4d..4684831416b0 100644 --- a/nixpkgs/pkgs/applications/editors/texmaker/default.nix +++ b/nixpkgs/pkgs/applications/editors/texmaker/default.nix @@ -36,5 +36,6 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cfouche markuskowa ]; + mainProgram = "texmaker"; }; } diff --git a/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 1f66a581dbe5..0451c067c16c 100644 --- a/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ajs124 cfouche ]; + mainProgram = "texstudio"; }; }) diff --git a/nixpkgs/pkgs/applications/editors/textadept/default.nix b/nixpkgs/pkgs/applications/editors/textadept/default.nix index 47a7445bd7f1..536f2cd11009 100644 --- a/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/nixpkgs/pkgs/applications/editors/textadept/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ raskin mirrexagon arcuru ]; platforms = platforms.linux; + mainProgram = "textadept"; }; } diff --git a/nixpkgs/pkgs/applications/editors/texworks/default.nix b/nixpkgs/pkgs/applications/editors/texworks/default.nix index b27ab8bbb69b..315db4115900 100644 --- a/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; + mainProgram = "texworks"; }; } diff --git a/nixpkgs/pkgs/applications/editors/thonny/default.nix b/nixpkgs/pkgs/applications/editors/thonny/default.nix index 9b6c9a02985d..2eae992a36c6 100644 --- a/nixpkgs/pkgs/applications/editors/thonny/default.nix +++ b/nixpkgs/pkgs/applications/editors/thonny/default.nix @@ -64,5 +64,6 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ leenaars ]; platforms = platforms.unix; + mainProgram = "thonny"; }; } diff --git a/nixpkgs/pkgs/applications/editors/tweak/default.nix b/nixpkgs/pkgs/applications/editors/tweak/default.nix index f6b241c9d07f..9663728e6ef9 100644 --- a/nixpkgs/pkgs/applications/editors/tweak/default.nix +++ b/nixpkgs/pkgs/applications/editors/tweak/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "tweak"; }; } diff --git a/nixpkgs/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix index 936cc9f7bb87..5bedface4c5a 100644 --- a/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -100,5 +100,6 @@ in stdenv.mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ npulidomateo ]; platforms = [ "x86_64-linux" ]; + mainProgram = "typora"; }; } diff --git a/nixpkgs/pkgs/applications/editors/uivonim/default.nix b/nixpkgs/pkgs/applications/editors/uivonim/default.nix index 36d3ee4afddc..a888747d0522 100644 --- a/nixpkgs/pkgs/applications/editors/uivonim/default.nix +++ b/nixpkgs/pkgs/applications/editors/uivonim/default.nix @@ -39,5 +39,6 @@ buildNpmPackage rec { maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; license = licenses.agpl3Only; + mainProgram = "uivonim"; }; } diff --git a/nixpkgs/pkgs/applications/editors/vbindiff/default.nix b/nixpkgs/pkgs/applications/editors/vbindiff/default.nix index 9a103867fbc6..30d902ce0fd0 100644 --- a/nixpkgs/pkgs/applications/editors/vbindiff/default.nix +++ b/nixpkgs/pkgs/applications/editors/vbindiff/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://www.cjmweb.net/vbindiff/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; + mainProgram = "vbindiff"; }; } diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 42958d277a4b..1083aa39ee20 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-11-04"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "68ff818a5bb7549f90b05e412b76fe448f605ffb"; - sha256 = "075zvc5d088m7zvjmap6c3g1kfnamg7sjjf5s4fcvwg20dn1zp9q"; + rev = "879e29504d43e9f178d967ecc34d482f902e5a91"; + sha256 = "0qvfvcfldrcinmrqvicsxrqa130b4xpgcwz390ai7xripqzqzrbz"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2023-10-30"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "59bf3ccc33bcf7010a06521fd3ac9be912261bd3"; - sha256 = "14hnfva8mp9dy0bw5hsm5dj2axkpvhn9qa3w5h51aljkgcn6r7nb"; + rev = "001b12c022babbe433bc53f8ecdac1c202c57977"; + sha256 = "0m722w9vzmxxn1km3czpj5n80cwdhviw0l7zjawgwa8ip8bd63kr"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-11-17"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "9fb873af43568464f9a1936fc334dfa3d7a59418"; - sha256 = "0w81xzrvjcwp5a6glyk3dcmghvbb4amlhxbbl71lz9k9w0dzcwac"; + rev = "5bfeb36550018438c2c7ef58f91174f79d99a28a"; + sha256 = "192rq8dzfckyz9vpvf489zbqxmd33r8mw6frdrm8fa9xq1q1i0ab"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -498,12 +498,12 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2023-08-23"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "5650c76abfb84d6498330dd045657ba630ecdbba"; - sha256 = "09i6fp5kjz2dxhhfznzlrq8gvn204byk4mw23cmxlkc6hnnz4z74"; + rev = "b2c89c2937d527c22deb194d574d2a93246cd869"; + sha256 = "0ib70ks303vy8yjjm8xrn6nyins6766w3fv223a3lbw5qrd1arc0"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-11-18"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "d82a994d66a9c6c700f240498304bd6d68fb33f0"; - sha256 = "0rjndafp4nz0qbaf614q92zkqcsqmr9i2v1c32q8cm1hxkapaf6q"; + rev = "88764566f96bf900a64b3dcd6d178cfb69b1c8ce"; + sha256 = "1mr3p7lwhh9dgjmk6lrnibixj1lwssn9kbkva3hwlmh0zw4n5mdd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -607,12 +607,12 @@ final: prev: alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; - version = "2023-09-14"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "234822140b265ec4ba3203e3e0be0e0bb826dff5"; - sha256 = "15iq6wkcij0sxngs3y221nffk3rk215frifklxzc2db5s9na4w5d"; + rev = "29074eeb869a6cbac9ce1fbbd04f5f5940311b32"; + sha256 = "13my49r11s0mm7q7cri7c0ymmasippp9wcfplsg1pmg73j9a6i27"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -811,12 +811,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2023-11-15"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "41ab08a3c56b2543263873e0f1a7d1f3267180fc"; - sha256 = "1d0d9c89i56qh6rks1sp8fzw6a09jyvqclya70vwxdyayz48mspc"; + rev = "6157dffe86f20d891df723c0c6734676295b01e0"; + sha256 = "0svr1p604ffybm0wwpn8in8nb3clcf28c2iwjvlw1zwvj3a0ldjr"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -943,12 +943,12 @@ final: prev: b64-nvim = buildVimPlugin { pname = "b64.nvim"; - version = "2023-04-12"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "taybart"; repo = "b64.nvim"; - rev = "0efc9f2d5baf546298c3ef936434fe5783d7ecb3"; - sha256 = "1sb24ydihp01qkrvfr1pc2wf5yjl9sb8b893x5hm6l8q8a70pr5h"; + rev = "e93d1a7e065f6eaf5d3bae9efb9bc2c30907f471"; + sha256 = "16gsvwqsj043b3jsmydfavj7ypipdsz84hxzv019hyzrj8ryvdc5"; }; meta.homepage = "https://github.com/taybart/b64.nvim/"; }; @@ -1171,12 +1171,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-11-01"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "9e8d2f695dd50ab6821a6a53a840c32d2067a78a"; - sha256 = "08k2b8i269c50gq3nl2s08izwl2p454xshl3yslcwwi3hsg25blm"; + rev = "1a3397556d194bb1f2cc530b07124ccc512c5501"; + sha256 = "0da8kyg229n658dcybnxr2ckcaz8lmwphdmr83ajvqh3dj92rmx6"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -2047,12 +2047,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-11-08"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "1efe2a2cdf516094bdb211aa8a1d45ef01836207"; - sha256 = "0kn0vrcn1ixa1lw5nchl7ahzmysx80lv6zf1dgqzrmk94miar15k"; + rev = "2a0c0b7fecee38a52fe750563ff70cff45f768b0"; + sha256 = "0a8j82lf4vhjwlghggm724m5lnd74ajjv6p77vdpyhg2b0xd756n"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2143,12 +2143,12 @@ final: prev: committia-vim = buildVimPlugin { pname = "committia.vim"; - version = "2021-11-24"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "0b4df1a7f48ffbc23b009bd14d58ee1be541917c"; - sha256 = "1scz52n6y2qrqd74kcsgvjkmxd37wmgzx2wail4sz88h3cks8w39"; + rev = "a187b8633694027ab5ef8a834527d33093282f95"; + sha256 = "1ncvpsa83g665yh3qxrwigsvpxpwm3586198zp6rlmq719d3yh3g"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-18"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "a36c68d2cd551e49883ddb2492c178d915567f58"; - sha256 = "1c9b4y41wf9kr4almhmqvg59nhslc6s5lgkpvv2mhchrqkm7zsba"; + rev = "3fc2c956d99216b2816f07d2b946020ba2e02457"; + sha256 = "1hv712cn3vn4gnr01a9maq787nb13x8nwachksnik49bq28g43g6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2348,24 +2348,24 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-11-04"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "73047082d72fcfdde1f73b7f17ad495cffcbafaa"; - sha256 = "159ghjskc2gydxvxsiijgz4swgad0njkmppalkj685wv5kl46pyg"; + rev = "3665ed0f3ef3ad68673df7195789d134d0d1fdb0"; + sha256 = "1vsyjxqzq57ckmj942i018r1zg56l908fg8i5z3rv4qyqrwjz725"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-11-01"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "309b3c803d1862d5e84c7c9c5749ae04010123b8"; - sha256 = "1l2rvqcc85mxcpf8a5jsv79bgzb4hjl77bq02npjhpcj8gi8drna"; + rev = "2c31989063b145830d5f0bea8ab529d2aef2427b"; + sha256 = "0icjjxgmi1v8jsidvh3lhnn04nkqpgfgr83mg2qa9603f1a34fqw"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2444,12 +2444,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-11-18"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "406295abeb7eedae3bcee3f0db690ada605c629c"; - sha256 = "1kiw5vkx3kqd5niyjnpimihd0cb5w8fz8pyq6sfh5am7ycvg5nfj"; + rev = "a8b8f60c33b16c8ef22f8064166daa29a47fca4a"; + sha256 = "0r86h7lpcicbh4453vigryi238kmsx149ffs6n53n898wlkla6pi"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2574,6 +2574,18 @@ final: prev: meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; + debugprint-nvim = buildVimPlugin { + pname = "debugprint.nvim"; + version = "2023-11-28"; + src = fetchFromGitHub { + owner = "andrewferrier"; + repo = "debugprint.nvim"; + rev = "8a6d66bd6162e9c49804e9286a7d4ceba60355d5"; + sha256 = "0ykxdjsffx1fz82ayl5mb0j1syqk3b6cjw7a6qcfcgh2w4dmijvm"; + }; + meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; + }; + defx-git = buildVimPlugin { pname = "defx-git"; version = "2021-01-01"; @@ -2660,12 +2672,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2023-11-08"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "8b53173370d3c2285abb34569b8d00b73d06eaa3"; - sha256 = "0qwalcsp7r1yk0mx8agsy2hpg3qia4nla3prkygdvybhk42jvxfi"; + rev = "6c7ebef6f71b948a152c09bd844fba00f8fee3d6"; + sha256 = "1qsfxw6yq6rpgmfmisqj4n30p5llb469zfg7iy4ri1r046pjv8yb"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -2950,24 +2962,24 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2023-10-05"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "019bbe9daea397c93a99adc747f8f071379fee5c"; - sha256 = "1ihgmg2kws57wypiyzibdh50gccxk7gl1iah84fcbyzm0lfdvk5p"; + rev = "27eb570085db2ef44bff4f620d3806039184651c"; + sha256 = "1f7ycdn9y27lz6925aqcjfhdyp1rab845dnc665cyzl5rai3kpsj"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2023-10-11"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "d38c1b5266850f77f75e006bcc26213684e1e141"; - sha256 = "1byqdh3x2yy1rj3gq0hyxpxwzlipvhv07ni9gz4644ssavjhalb6"; + rev = "3dc498c9777fe79156f3d32dddd483b8b3dbd95f"; + sha256 = "1zvgm0icmc4z48vnd6pn7pvl6sg89mm4symr0rwiix8s942nfiyw"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -3046,12 +3058,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-11-18"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "d308748aa5ea44e9df35d2f5333cd2de148fcf3c"; - sha256 = "0zymllwlf4kvrg3ns9ygsxj44z3yvvcdb8srigx2ffhjgqnri0kw"; + rev = "3b7978b382ef09ca84b4248f1033df4f346889f4"; + sha256 = "1yf4jihacmblw8vynspv68d3iyb8ydp57qza6mff5x4xxcpbkfsr"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3106,12 +3118,12 @@ final: prev: editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2023-09-23"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "0d54ea863089fb13be423b4aed6cca35f3a5d778"; - sha256 = "1d5r480njjgvn5w5ldhrj5gi38lqhnlyi1f7fvpjgl0lbyyqwp9s"; + rev = "7eec46701ec7a954a6cb0b0e348ad7c13a893425"; + sha256 = "17jfdlik09nqma3kb12kx0y0svjndcc6ay4589k83zm2cy4wd0h9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3131,12 +3143,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-11-18"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "ed7bd2581318aebc409f54fa4756023d2e6fb7d6"; - sha256 = "1pbq011s78pq2agjy7gkqkzn9zr5slnik1m5h8mplz9bb28pjb0a"; + rev = "ff84e0402907f9557778bd6cb32f9d5b1552ffaf"; + sha256 = "01f3al8hncjj043q6490gzxz38sjv7if49148116yfdbipj1lf60"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3228,12 +3240,12 @@ final: prev: executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2023-09-07"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "f98049ceabb0ada223dfad2b40bf06df30331e0a"; - sha256 = "0xzjfacbx3agrl481dnb8f4i3h2b36hcbwzdca1m17rd5i51zka3"; + rev = "2af6072829562922e047ed644fc83749c4b10d92"; + sha256 = "0v2bk4nyrkc7qkrh6sb16dif382b26gjix83sfnyk973g07v43in"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; @@ -3300,12 +3312,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-11-18"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "8bfa1a88d19d86756ef468ad2e499e0337084317"; - sha256 = "190rf7v70jchjj4vrg7sf8ish99kf9n3jqkb009hd8kv68j65lpd"; + rev = "a6bebd903e84d5ce0e97c597e0ca85cd24109002"; + sha256 = "0jkrn0ndrjangbis18q7h57pj04sgbm4b69hmcrwp65w1fs7ciha"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3348,12 +3360,12 @@ final: prev: fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; - version = "2023-11-09"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "2f7c08f45639a64a5c0abcf67321d52c3f499ae6"; - sha256 = "0x4vbqbpzsw1pkqnm6l8hymm35vnfpl5vdaa91g6890q9q57csgh"; + rev = "785efc604f6ffe3c3fdd2ea86262804d48863ee1"; + sha256 = "01c0pcfvr2acpc70ljmr2dcmg6mvfyvsr9inxgwxv347pdi8phll"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3409,12 +3421,12 @@ final: prev: flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-10-11"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "f75bd1eae9aa826dda5ddc3a8cf5a0efa6df046b"; - sha256 = "094cmx9k03lh0ak8wnfc70s2ca81r0qddgcraja8px04c2fm5ln1"; + rev = "51dd9a0a83138aee3bd9fc402ce79f9db50af7fa"; + sha256 = "17mg19d7n1bcmkv6q4fx60v1pmq7ll2qxqycybfrd82458wcbc6z"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3505,12 +3517,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2023-11-13"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "91651e6afaf6f73b0ffb8b433c06cd4e06f90403"; - sha256 = "1dsxlhsfhdd37l8z9pg2f5s0r4rafk6jl92wz1zcbhf6iswa6vy7"; + rev = "cb4778b8432f1ae86dae4634c0b611cb269a4c2f"; + sha256 = "07mr1sl8gwxcwkazgjv6zpbk2r0nv51al2ksmcd740bb4g1xgr0b"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3529,12 +3541,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2023-10-01"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "43727c2ff84240e55d4069ec3e6158d74cb534b6"; - sha256 = "1sjk17gn919aa84dkjfagwwjsas9zfkbrk840bjf580k8m83d9m8"; + rev = "53d3df271d031c405255e99410628c26a8f0d2b0"; + sha256 = "07zggsby7v2migmc314nd1dsga9ixwp89ibwlsl3lrm2dwqlkbg9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3637,12 +3649,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-11-19"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "640d6415baf6b12c20c16fdd177f106c5575d6c1"; - sha256 = "1yrqa1zj6jyf3r6cb6s06mxk6fb4wwdzw08x454f9amw93cah25m"; + rev = "474af4d6e2f0ebfbb5df85ca7827b67949717bae"; + sha256 = "0236ccalzkwv2qzspqdglnkvpflzcppllp4v5bn6v1lbnlyqj7dm"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3805,12 +3817,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-11-17"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55"; - sha256 = "0xgw0p6wb33wlb4lnnjj1adxsll6lnmq3niabqzricsz4phmvf4f"; + rev = "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2"; + sha256 = "086jmhzgpavwjvp7ssd8ga0wxgnz480zzjiv84h4ivva2nv3lnvi"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3865,12 +3877,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-11-15"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "e749ff85ffec5a4ef11cb8252a2030be5726cb6c"; - sha256 = "0811lkf5cr9qsp4as3lqq04w545ygmxj1sad66gabvk8lcq7indj"; + rev = "e0528b5868b8c488fb6eaf1a4f7b298976d419a5"; + sha256 = "08xh4i09akm13gaj5zzlqlhcrr1i21jwqzxljf7i5wklpw7hf03c"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3913,12 +3925,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2023-09-26"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "b428db4d2a5b7c06e149a020e31b2121fbf57a67"; - sha256 = "13lc0yjmwzwkdj92rlcwqpyic30z5vq3ss73bkzwl4vkqg413zla"; + rev = "16ec236fabb40b2cebfe283b1d701338886462db"; + sha256 = "006r0dl3nj0d642lniss3gbclix32bypykh7c8ml7qfh07mjahs7"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3985,24 +3997,24 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2023-10-24"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "d13f4d4e75510e3d798f2ff7561d3c8991220375"; - sha256 = "0hrgzfc4hss3ng6jmkn4rsvwkw1pgck98gnqv32hda4w9bni6pzc"; + rev = "7f56d9f9c4860df528031539d321a61f6e081dee"; + sha256 = "14c5ylsnp99viqvgyc67xi3987086kbsrw44yslxkpvf4na8b3a4"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2023-11-11"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "517b012757fbe7a4d6e507baf5cc75837e62734f"; - sha256 = "1ndbd6mn19g3wiqshw9wckkl976kjvgy2dc3lmb92cyxjni8a507"; + rev = "0940564208a490c173216c3b7d2188b0a5ad3491"; + sha256 = "15vlr7wh9grfn2s4vhmi5a2pap00366irvyglc1g0wvj3w7n520z"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4080,12 +4092,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-11-19"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "88c3ddac1885f3ee0e9b4664296b10d30a04c731"; - sha256 = "159rr16jic7cwc6ai539a8gvzjr2klnmhdyyp0c8nr0jl298y3cj"; + rev = "8bfbba643d908e8757d591cf01e2241dd46b0858"; + sha256 = "05np6ahzf6mk6ksfak12y7iwgfkrpkwhgf366bqlbk236g3k7sk0"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4140,12 +4152,12 @@ final: prev: heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2023-09-03"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "7f1e805dfc001d5dbb7d894105063f463f6c7dcc"; - sha256 = "1hy5a30pb0cv93dh796lh08p5k43b4b732sr4ka0pwj4n4a3q82r"; + rev = "170e1b1fd7c11db00e46d802165fb277db601ae7"; + sha256 = "04dlwis61di60pv11xl2i1sllqmrhq077svqga8sxfh557hspr04"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4271,12 +4283,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-11-18"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "cf58d40c90a36c2b2ec6629e84bee9617a7a31c6"; - sha256 = "0dxyvf6yrdvl0hhnwzsa9im20r100kr4dsvrfa7djbib1n8qvy65"; + rev = "0a0dd1baf1bb9415e3358207b6ab35747fb5f3ba"; + sha256 = "0fms4z45wx8wwl74k24kf19pcxim1wcf3crbcnl3bx34ivzy6id0"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4355,12 +4367,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-11-16"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "2a4975130a39d9317595bb356b2ff5663f7d8a77"; - sha256 = "1r785mgavpc54lr9220n80mp8x90j20snwzicp80ahn407vs10n0"; + rev = "41f0f2643a09631bc0d8e2837b514667d423e440"; + sha256 = "02fzgynv02fgj8ayyjdhkh290pzii0nllxpzmraa5z5w0rrs3s9y"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4379,12 +4391,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2023-06-03"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "ed0f6f2b917cac4eb3259f907da0a481b27a3b7e"; - sha256 = "088l7xkr7sqmfdm786vavg36z9lpapn79zbr2gxrqwisbysmamcb"; + rev = "14922a84777702244a499b43134b9d04e640cbcd"; + sha256 = "161gh780mxm8vfvdbfxbbvww36byx4zxhw0simvx2cqfxfik3gi0"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -4716,12 +4728,12 @@ final: prev: kommentary = buildVimPlugin { pname = "kommentary"; - version = "2023-01-06"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "3a80117148c6798972bb69414423311ab151d368"; - sha256 = "0d98hijynmdys7pyh9alk30lsp6ihsbbgzhi8gzjbms16fvgk29p"; + rev = "d5a111a3bc4109a8f913a5863c9092b3b3801482"; + sha256 = "0zdcfj19i3b069575rqwmaiar9860x7hk6fgm95fb2d3inivg5ln"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -4812,12 +4824,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-11-17"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "47ff75ce2fcc319fe7d8e031bc42a75473919b93"; - sha256 = "17ab2q4xq1phhn2pxci0qjib1fjr5yl9lqpwf2sy49plhg7ix4zp"; + rev = "73e9844702f7b80344e89e3fb465fc1550dd3658"; + sha256 = "0xq48hdv3hh52rs561m359ccvr7qpv867agxql9qh4yf9v3kw764"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4908,12 +4920,12 @@ final: prev: lf-vim = buildVimPlugin { pname = "lf.vim"; - version = "2023-10-19"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "f2bab8f4a420ec434f1fb4b5fa4ee354f6dd2afd"; - sha256 = "044wgd5wscpss4jc5czwsjc4ycx3kykxijzr8c7kymy5ydalpmgj"; + rev = "2be63cd4553d59008547f0ffe4643a90ec6260b3"; + sha256 = "0j04287khy57p5hykiy5wi87b37k86n6fks648fk0s1jm8frb1j6"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -4956,12 +4968,12 @@ final: prev: lightline-bufferline = buildVimPlugin { pname = "lightline-bufferline"; - version = "2023-11-02"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "d65e4d1220a35f1f19441116e0f1dab641e1cc51"; - sha256 = "0xx64dwfnra335kadr2p6a8hyv0bxpfcix7k3f0qbd1hvzf0pihc"; + rev = "8206632c2e399c6bbf348fa2f8de22788a960629"; + sha256 = "1nfy7jjadlfpdaqskf4wfk2sm9h255dl8zmwq5nrbnfx2drfj8fn"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -4992,12 +5004,12 @@ final: prev: lightline-vim = buildVimPlugin { pname = "lightline.vim"; - version = "2023-09-03"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f11645cc6d37871244f2ea0ae972d3f6af9c8f73"; - sha256 = "0gqqbwsvdfigqk2c22i6hmyzqk42qwgqnnpbpivyam4m4f8rpka8"; + rev = "1c6b455c0445b8bc1c4c16ba569a43c6348411cc"; + sha256 = "0dxdcyihw8vcybdwn7rzd011pxi5i008xx3mwjc4rmldbzb530ka"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -5196,12 +5208,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2023-11-13"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "8a9ee4e11a3e23101d1d1d11aaac3159ad925cc9"; - sha256 = "0snk9as2m5dz3m0iki4mrs8j5kd3zr0bfpwxi0i70y4hzxaqlwm1"; + rev = "98fe58a00c69f709b6b65e53aed56d86da92a4b7"; + sha256 = "1sacv394xy4i5y63r7pyv5xgkmlwjjwxvml0rsasgiwnsrmgagw7"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5231,12 +5243,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-11-19"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "8055851d16831370f5249c30a04f2eafcb0b76d3"; - sha256 = "0dk9r44i9anrjs84s1139vcxmfpw006cqbblis8lhbmwa7m6vhkp"; + rev = "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0"; + sha256 = "18cwrdww4yxl597d95yixhwxlavmkl37nslpida9cincxrz16rz0"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5267,12 +5279,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-11-19"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "424503af246033f177a11c9959424bbb3640f077"; - sha256 = "1ykncpyd7yf73clxifcjsm1lvsy8mzy84j5z203gpl2zwpcnn1sc"; + rev = "d3dfaea0125315110ea720c337ab88aa451d75e7"; + sha256 = "07bm8gvzx68cdy7jkhva3caqjqazrh5hnhr3yi1qa6g1vlmnb0f7"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5315,12 +5327,12 @@ final: prev: luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-11-13"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1f4ad8bb72bdeb60975e98652636b991a9b7475d"; - sha256 = "174pwxjdnb1gxxrnvz6zplr5r2cwjq79si1ns1ymziq4lrxjnni8"; + rev = "1def35377854535bb3b0f4cc7a33c083cdb12571"; + sha256 = "1g34ivzymgv214rpmwcmv91l4gp29q4r6cbv8xszzvxmc7dxcgkr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5424,12 +5436,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-11-17"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "ab640b38ca9fa50d25d2d249b6606b9456b628d5"; - sha256 = "16lc26ypiq29jnmxdqhvlj30q1lbfin89cdahchils8fir6pn3sg"; + rev = "41674c9d50f23cfa3e11f0ca964eb9100c2a8922"; + sha256 = "030vyd0n45kd9j33kb20v8kx9pg66702525gnjbcrv5a8npldm1q"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5472,12 +5484,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-11-16"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "a74108b417cff78d15074f6f68a8f997e718f404"; - sha256 = "1vfndgk09kvrwj3kviff4c8wsi8gd7pym5wg0r17jflmqr7y2y5m"; + rev = "d61da5decc7768769314c121a3232b6eadc73f2d"; + sha256 = "1jsjshi8hwiyazpchhc5smsp2p9n7g54i7px4crc0gdnm3sxk5q0"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5544,12 +5556,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-19"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "92e2ae609f612f11f7e8e45d13614fcdff9f89b9"; - sha256 = "0fwg6k01njgybj1ca9iy92psi2slq227zlmp74z97fh1m9sn6b8l"; + rev = "964fab7fecd14f66a69a96162f8aa816480690fd"; + sha256 = "1vxbjidpxhjbrbhg5kl4x4dcsn77nfybzbnlq4yjcpcsrmf8ms5i"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5580,12 +5592,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-10-26"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "3b3563c61af31ecbf6522e92626929b8654649d5"; - sha256 = "0hqmxszry28in5c3nf6ixwa5q4ngwmpi75kx8niy8329nrnb7lzb"; + rev = "f23b219b11bf2ac242db80809186241f944410cf"; + sha256 = "1yclcdmw6r7fr7zx7rzjnf6h20n7y1nlfnz932yjnc233dq9kdsy"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5628,12 +5640,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2023-11-19"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "413d0eab0d37d770759b4e2aba9205182fa796da"; - sha256 = "0xaxiqdf99901fpwv7h4a03k7qfqdnr9rfmrj1yx6rcai2yiwxyc"; + rev = "93f2f168e77cbd82a881e07030cdbd45a48ed070"; + sha256 = "0rvzxd2y3lrmwc0q2vrz5fr42qy682jkrqr3iwydxbwipp6ky7s2"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -5676,12 +5688,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-11-03"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b4e8571b79a7d2a2aea70922c35eac3a71578c0e"; - sha256 = "0brpnb1dbw9xsmd2g5ydq5gvmk3xf1q69n3x2i1rd5bcyzcg6f8n"; + rev = "8e876fe9db46c1b76c151202b418df21eca07bad"; + sha256 = "0jva5l38ikzgy0nw2il6yfpm9z7ibi99ijfqnwcy7zq9kryysnmy"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -5988,24 +6000,24 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-11-19"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "627b5b543f4df551fcddb99c17a8e260c453400d"; - sha256 = "0b3cv7w6ic9wbfnr11p0f1dnfzpwlnx10lw6wyhlfg8mwx8dvksb"; + rev = "1676d2c24186fc30005317e0306d20c639b2351b"; + sha256 = "1iv3nkzn2p7dbyzdzir0iw3yzvczj6mskz01yiwv9jgq0dpl9rzc"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-11-10"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7"; - sha256 = "1263nvq9a275340hdnkimz70xq615a9rz2s8szncii35z10szjm7"; + rev = "afbc055587e88554b1fd11408cfab859d0cd40d3"; + sha256 = "0p7vvl7nc5caijgksshwibdq704kq3r6rq7w5ih3vnk1i7s5sw1h"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6024,12 +6036,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-11-18"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "987e415247547a372d0356f76444cf402436c727"; - sha256 = "00ppnr40s8lhlvga1m87xgwrdnyzj6as4522jl0n31lx7f90bvpm"; + rev = "1ab1504ab87016e1d12b8f23543532a3006adb3b"; + sha256 = "147k8rxcqqp85l1mjklak0bfzbwn2gkxkm4ykw01srkzy5jlhdwp"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6096,12 +6108,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-11-18"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "095fad9481f5a678625a99dc06e9991c5d11efc8"; - sha256 = "1wqdhyr4z377y2gjlc4vg0v9wnnxwyxbcj5ahmihj1nfwrj1l7pa"; + rev = "f4466457396717d10d2d235d019e0a80e1770087"; + sha256 = "07gs0hdgy7q5sq3cj29jc8qlwsjmr74hqgy0l38pljbqxajigsww"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6216,12 +6228,12 @@ final: prev: neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; - version = "2023-11-14"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "0e85312566c6ef0aa7456503e4038cc5541e7df4"; - sha256 = "0jcbmh0w8zvhdkk111cvsb56j67bc2l0vf7dcyswn50p96djq5g0"; + rev = "3117ca5442c02998847131c39551b76a6ceac9d7"; + sha256 = "1apbn6awihmjxqj465h0aik6nhd2lh00k7vbpl3mrrh9pxifyglr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; @@ -6229,24 +6241,24 @@ final: prev: neotest-go = buildVimPlugin { pname = "neotest-go"; - version = "2023-09-10"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-go"; - rev = "1a15e1136db43775214a3e7a598f8930c29c94b7"; - sha256 = "06j4d0ii46556hwx4ygjajr2mm2wdb3vgjrq4hldfjfb2033wnxg"; + rev = "d29d20d912aca81a07c50022d880cc66f0d26542"; + sha256 = "0dhmkh2k18klhlv3cpjsi23ym0isrsf59dr0da2m9528pjzf1qi6"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-11-19"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "9bb7981e4753daaf705350b3d98305a488b82dff"; - sha256 = "1q229xqsv9in0n78hpi0sj6apqyzs9iqbhwnh57swd0v4x85ync6"; + rev = "c028b2c02d3ee749d8b485162ed2318cc241185f"; + sha256 = "0w9xci72fdyya9lpsr159p4zyknscsxfjys5dr06s44ncj5mv12g"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6277,12 +6289,12 @@ final: prev: neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; - version = "2023-06-04"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "4e23b92d85a09b9731458ff7058ece4113c5d736"; - sha256 = "0a53p993vkqgfjssydkq9n6mhhz7rdh8cbljxzx74rw4jam7acyz"; + rev = "77f348ff9a3288c67c37fbb99efc1731d4f7c55c"; + sha256 = "0d2r6fq4qnjx55jdaq4jqsp6dhajfsd0g7kmhzvqjnfz64cz97zp"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; @@ -6325,12 +6337,12 @@ final: prev: neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2023-11-13"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "f4e58d5278344440f65c5a5177f16711337e44f7"; - sha256 = "1ysg0vh7kw1sqpzdhgy13j9aljwk47jh5ss2y3k54j8a1qrx5c3j"; + rev = "46428d9013023f516a61274a78b0cee87fb7e8bc"; + sha256 = "0k6fqifyxa0m01jrxv9yxv6rzval36j1dps2awbccna0mxjjgjhp"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6385,12 +6397,12 @@ final: prev: neovim-fuzzy = buildVimPlugin { pname = "neovim-fuzzy"; - version = "2023-01-25"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "f6a1429bd0ac9953eb1d838ba800e69685fbcac1"; - sha256 = "0d2r8dx9sicf4fjf87ksclsvdvx2f7npjqpscyvycn04wrzvjsaq"; + rev = "16ee769bb459e8173a2ef9f515905c8f879ff7c6"; + sha256 = "0ibdg66fri1r0scqvxvs52bcr2h246kc52x2g2n3agr5c38hz9sc"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -6493,24 +6505,24 @@ final: prev: nginx-vim = buildVimPlugin { pname = "nginx.vim"; - version = "2023-01-25"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42"; - sha256 = "12dhzglvmpv1b0ynwig224dnilakqkwh4npidmgh5njy2rrqvy9m"; + rev = "cffaec54f0c7f9518de053634413a20e90eac825"; + sha256 = "04m5firsdi5dy4w6s8fw1vlpgnzr8dgx4fgx348kvxg1iky9l4hs"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-10-16"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "6a6076bd678f825ffbe16ec97807793c3167f1a7"; - sha256 = "1p1gp2p08mh0z7ckr63lw76ac91pssv0k2jczwpkibqmpp4imwnx"; + rev = "eb82712f86319272f4b7b9dbb4ec6df650e6987f"; + sha256 = "1ab734sg19g9q448qkv183rcj72r2gchwpmr0snnlkbmz9x547js"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -6577,12 +6589,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-11-10"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "2bcb6b761a34c69739da9aab642839b59236b801"; - sha256 = "1pd2qzc3gvrbwhxd5i2bc5jd1ll762m23qsjpbhc4xm5dyq66i89"; + rev = "0311b1654098b28c29a99007844dfa4bfe315b0a"; + sha256 = "01rx8pf5qkga3x4y9902pwkjh0xifgba4xk6wfr0akn1slwd1g11"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -6601,12 +6613,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-11-17"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "fa9be1679db7bf57d44128a018db43da5488a07f"; - sha256 = "0cqmdkxksridq4qgdfjcvinqq274lqidpblgijv5iqa14zzng0b0"; + rev = "3a4826687da4310af379515086d71faca4d21288"; + sha256 = "1fcln8z31cmmg0dclp8gwiy74pfa4ylic74pdf4mcsaqbm5blkr4"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6661,12 +6673,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2023-10-09"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32"; - sha256 = "0x3bf63d4xblpvjirnhsk4ifb58rw6wprmj86dsfqjzls37fw6m5"; + rev = "257dccc43b4badc735978f0791d216f7d665b75a"; + sha256 = "144qi4wvbcycnypyvyc2kk9fadr1bsv7j3zx5h3s0sffy8x4lz0m"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6937,12 +6949,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-11-17"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "e154fdb6d70b3765d71f296e718b29d8b7026a63"; - sha256 = "156hp1i8vm0fpy5vbcx0ihazblnly72vjsiy8bf9f30i9rvq9knv"; + rev = "13ce59d4852be2bb3cd4967947985cb0ceaff460"; + sha256 = "0xk8cqb4i5bq4bw5l3idgci8i5r5is4i7451rbxpnzxnb1xj0agf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7081,12 +7093,12 @@ final: prev: nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2023-08-06"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "f0281591a59e95400babf61a96e59ba20e5c9533"; - sha256 = "1ih4zkb025wvns0bgk3g9ps9krwj5jfzi49qqvg5v3v707ypq2kj"; + rev = "9bd8d6b155fafc59da18291858c39f115464287c"; + sha256 = "0d3dxc0v347z6dz7zmnf845kzv6j2yca94pgakaac4x6m3lcy5xl"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -7105,12 +7117,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-11-01"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "503a399e0d0b5d432068ab5ae24b9848891b0d53"; - sha256 = "0qq8sr32k9wv92km71h5clpmhsnck3i0dj40qapabb3iaw8iwhwf"; + rev = "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8"; + sha256 = "1cycasjvms1m58vcb3sk01dp4dzjjchds20yq0c6vq1s98wir0y6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7176,24 +7188,24 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-11-15"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "b1db01865791b324918a7835984c0f96112df37c"; - sha256 = "1smxkw2pkmcbhypmcmssbnq0cpi2jsq7ihsm9nzp7mpvxz21gd34"; + rev = "463b8190db2455d3bc764d234076b8b42e405c28"; + sha256 = "1v024pi0xanax2q3blmq7cz8cl1vnb7shpzk4agda823qxm9kc3i"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-11-17"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39"; - sha256 = "1aqycpp4h274bhgx284fy632p89wx54cgjmqd1f0x1i2i94rvgap"; + rev = "6f589cb93560581dc2a3b9693658afe865e5649e"; + sha256 = "0zrqdcz604azwm7342vvqbdxvpqd40rr50qcfj1lfrlxxj46qgb1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7224,12 +7236,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-19"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6516abf5ac7d017480c8c8e08c0d24066bcb8d43"; - sha256 = "1vwjwqb5fsvf6bdj3c2wrja00jm3p4q2xhp7zg1na2nxsclswnqs"; + rev = "fcf153fbbf1facd16a71d46b92be8be495123a9f"; + sha256 = "13h9nx74afvabrn51b4wjb6k6svidbmwq5czl03p3rp37lywkxcw"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7284,12 +7296,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-11-16"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "a3a75d094cc880dcd1fd9745fea2f0cd84662110"; - sha256 = "0zjlcsmz3381ir4sl2n7r2b91d7x5hp12g03v27y381p9q5kg41y"; + rev = "826b7542b8bccf9a120d1c613481fb0496f93724"; + sha256 = "03hifwc01nc3s4hlbfhfpcw7as0l6sfgsrh0flmqpxhdix52gljm"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7320,12 +7332,12 @@ final: prev: nvim-navic = buildVimPlugin { pname = "nvim-navic"; - version = "2023-09-18"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "0ffa7ffe6588f3417e680439872f5049e38a24db"; - sha256 = "04fd7gcs6hhc44pya1k8ds332hm1jpg44w3ri14g3r2850b8b02z"; + rev = "8649f694d3e76ee10c19255dece6411c29206a54"; + sha256 = "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -7452,12 +7464,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-11-16"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "74ab63b598cca206888e83090ed6312aac324b4c"; - sha256 = "0habi91wq7q6i49x20ipli9kd84iflpz0wb2lfwnmhii1dfvmifh"; + rev = "1b11329ece4cd25884b56c129aedc23ff1665d92"; + sha256 = "0n7mqssagmq40glaiybmf8d5664665q32d9kbgz00jgnnj9n93ay"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7572,36 +7584,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-11-19"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "46e1f776f0a714099b9160604fbb62fba2540376"; - sha256 = "1c3i4hzr68izlk3r4lain0v1kqh1l078gc8bf8mj7vgwa67mplj0"; + rev = "05f55c1fd6470b31627655c528245794e3cd4b2c"; + sha256 = "1kjagblw41981h4lzx8mpaksb2c5jdz2icq4ccf5sxd8f6fprhbw"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-19"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d87629647614b779fb2aad8f0042fe2864253ea6"; - sha256 = "04y1hygrpgkfb9y7ncbdrmqbzzvlr3f1xn3dgmyswl1cb602525b"; + rev = "b41bbcbb9a2c5543d3bfa4cf7e2b0948a5f61ce6"; + sha256 = "1nsfxaxi2wkbs32kfxsbd23m2xx0fickffjgcprj079bgl64z47k"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-11-18"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "f3ec0d8a1b4e07d7ed2da6b9a9f10864a83c4be4"; - sha256 = "1kbx404z9ziy2ylj9qkmrdkhb4mjhvijnrb29hdbjh1hymhghxzp"; + rev = "bf4d15ee4e96ff5201f16a4ed14443670662eb90"; + sha256 = "0a7mmyrwi2x34fbjxwnzw9qm2imaffx4bmkn0rpa0l4sm6qs9way"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7644,12 +7656,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-11-10"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "dbcd9388e3b119a87c785e10a00d62876077d23d"; - sha256 = "0qprl987ljj9ki24n75g5fvpj8h4rqzx7n6sdicpmw9d91bn169b"; + rev = "aa7935c60aff501580b7f4872a7082e615ea5be3"; + sha256 = "0j9fv564l4k1jf29h0mb5vnm2h1x3balrpnmchav527ylcaxhgmm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7680,12 +7692,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-11-18"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "ead792ccdace6a9d64a8119909af243ed0105465"; - sha256 = "0s55gcdh6yi0mpszqaj10sm25nk6wichli6zavs7ywg29nfxl3h8"; + rev = "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee"; + sha256 = "0363gb837rm66127z7b7q20ak4dgby3q1r0wvz5sqbkw8d704jgb"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7715,36 +7727,36 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-11-15"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "a6132d058f23d15686f07b8e1ca252e060a0e0ce"; - sha256 = "0ijlsw9x3g2h48wvcagp1h4pvyjrrlc1cn0jni5pqs6fqjlcbypk"; + rev = "c1e75fb93a5413c73221e23d549cc9f208d592fb"; + sha256 = "0kwxqrbb0n12bq3iqidk8i67ag4g6rdnqzk5gcjjvm6qlvvylggz"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; nvim-unception = buildVimPlugin { pname = "nvim-unception"; - version = "2023-04-11"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "samjwill"; repo = "nvim-unception"; - rev = "0cbf11a6c5c4314e88245b69d460f85f30885d2e"; - sha256 = "12fy3nchbg7w8yyhk1ym5amx8kvvx73wmlqgi8ss2ikywc7n5d0c"; + rev = "23085504347a710e43d7921ccb839fda8f1a70c1"; + sha256 = "0lprrkgm1plnw28vfpq550gakyw3ngxw930lr72wcx82r029i51g"; }; meta.homepage = "https://github.com/samjwill/nvim-unception/"; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-11-19"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "e2f6e0e299e193d7e9c48634d355f7a6eb3020b4"; - sha256 = "06588a1ksahy51vszi7ri5i40yy2hxbp2zgrd1xnlc2xk0bxzbqh"; + rev = "5efb8bd06841f91f97c90e16de85e96d57e9c862"; + sha256 = "1vxc1b51h6ss6h7fcihl6v01v8a8df1i6hz11hq2m46dyqw2n5p9"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7847,24 +7859,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-11-13"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "5d6bed660ff18878a9096b3acef9c444b85021ac"; - sha256 = "1y1d1fa5m5wch2daskshmwm934qgbaca9s1340y36bhysbdd7ifj"; + rev = "1ce62d9a29b5eca2c63fb955359f5212e4d1bc7b"; + sha256 = "12yykcj8g1xrl7xlyvfb6jkqyxd17ixnfsrqym0y3lva01gs44zl"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-11-15"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "af04969c437e0c46a2b3c86d7892458e878ecc40"; - sha256 = "17mi1hs3jmmrxqxhykqf0xj91ssxzzzig7gmdlyak6pgwln2ziyr"; + rev = "e89a8f8adeef2dfab851fd056d38ee7afc97c249"; + sha256 = "1f5201yb7kqbggn0dgpl9p5mnxdxg6ffpfmzih7rzzkp4fhn2vb4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7896,12 +7908,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2023-10-19"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "b9acd92ded2ba155867ca5af9d618e933d96e3b0"; - sha256 = "03a42mqqhd18skf765n3cf41i31wdc14w7z0vra4ll7d0p6qrdsz"; + rev = "e7c656ac6b6460aaab817cbd0c9d5c043eda4b43"; + sha256 = "1f25ipxzigmq24a6krhs4akgp9hmhyby150kxzy3zn8n3yn0p8c9"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -8004,12 +8016,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-11-09"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "e9c08d58c13372981815d207c78763e5beac32d4"; - sha256 = "1rcq9gl29l5925ny1vqrfynzri84c0hn2nw8rd01210jilpsp2d8"; + rev = "cbb10d4c7514680e90f791d62f1168cb87aad0ce"; + sha256 = "1l6h7yx7sq5g6wv1ggns98scdyqxs317laj543pd1ji9pfqpmnpr"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8053,12 +8065,12 @@ final: prev: oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; - version = "2023-09-23"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "b47c0ecab3a4270815afb3b05e03423b04cca8f2"; - sha256 = "1hkjc7x5ma8pmz5vi93ygqmbdfammikpvjjxkw9axlh5wh8ys48y"; + rev = "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2"; + sha256 = "1789b010h8yz0yg60xjssl6fz02dbpkq90ldalyqk5p4ncn41qpv"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -8233,12 +8245,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-10-11"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "50012918b2fc8357b87cff2a7f7f0446e47da174"; - sha256 = "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd"; + rev = "55d9fe89e33efd26f532ef20223e5f9430c8b0c0"; + sha256 = "1f6vqqafk78njpl47xgsf8p199mmvw4h4b9axab9rl86fdlibikz"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8366,12 +8378,12 @@ final: prev: promise-async = buildVimPlugin { pname = "promise-async"; - version = "2023-04-09"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "promise-async"; - rev = "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e"; - sha256 = "0cavxw5v3nhnrs26r7cqxirq2ydk5g1ymcd3m4gf4rjjw9n067sd"; + rev = "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6"; + sha256 = "0davvjhc5pxa8j3l7njqk9dqc7m9f4hg037xcz0nr23ihhs2ja96"; }; meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; @@ -8439,12 +8451,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-11-18"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "4e9910b1c4cbd49d8ccd001e7a59b700c57cd71b"; - sha256 = "170d89xh104fzcmnd8az65jvdr2bs3lyaqw8icpbav7vfi7d099a"; + rev = "0a35b3890e9d723b730506d7d8b3ba3d0d6aae2e"; + sha256 = "1pkyr1pqq9dfk0s7f8rfqkg5zqhi9ss818wv54v9gnhvmwnw30mk"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8511,11 +8523,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-11-19"; + version = "2023-11-26"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "072210357169394dff90d30ccfe0ac92530a9317"; - sha256 = "03ky9w9lvsb48lihx6lnmsj67w39hc79qhajr148zlldby7cw2v6"; + rev = "47404636a34580db1636dc0cf35027bdf77abba5"; + sha256 = "0li17i97h8iyk4pa79n1jgzi3firnjmz88vxx0aadd3x33p45d2r"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8654,12 +8666,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-10-27"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "b8d6c0a8762fd374e0204768a94241135ca3e311"; - sha256 = "038h0cygs58i6llps9lm58zgb806r1gvqf88afz8n56248jhkcmx"; + rev = "45b52200b4a7712a68579d9d13945427e2764725"; + sha256 = "0xn6yw5yiwj4fmq1yw0cc30g5qcn6sw3v7wps41h1dbrgickj9ld"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8762,12 +8774,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-11-19"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "540ff82e5f47f3e39bd583acfbd813f4ac90d4a6"; - sha256 = "096i4rrs2yjrhixwzcwh9ppiq5cjdvn3in6b0m4qh9wk3i0kxrvx"; + rev = "bdd7155a18249f39a014115a8832ee770e503812"; + sha256 = "0abwc7shfqcr31m7gaaxq07ym24s6gz8mkc49f5j0idcfj4k4n1v"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9051,12 +9063,12 @@ final: prev: snap = buildVimPlugin { pname = "snap"; - version = "2023-11-18"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "149ad2d3c297a11135322d00a2a3cef35911b278"; - sha256 = "1lkcid96ngaw1yyyin639x1icybd97g7016m9n4y2xrmkdbx32h4"; + rev = "09fa206b460050b96bc9b3a283377c8c11fb32fe"; + sha256 = "02c12bar3xr4xkg835r0bkxcyp3n5pf1zgrbx58hl61fx4f1z7df"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -9679,12 +9691,12 @@ final: prev: telescope-cheat-nvim = buildVimPlugin { pname = "telescope-cheat.nvim"; - version = "2023-02-19"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-cheat.nvim"; - rev = "5549dfe9207b06eb28bff74af977f078376f9762"; - sha256 = "0wxdv266fn83yh1dy05pw5xgd0j7gndngk3s3g7lljbj7y0nzy5m"; + rev = "93f4af8240819833ba9c81c0947ee9fc94c93490"; + sha256 = "1wlhy52kjhvvhg6cmq5r60rqhma09zdz084fybcx3z3gfsgym4c7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; }; @@ -9715,24 +9727,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-11-16"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "f41675fddb1ea9003187d07ecc627a8bf8292633"; - sha256 = "05qvb1fsnby5c5x5my601lavbk3m9w10dnq6i55yp42ksrk8zjki"; + rev = "d7c453396a043c265bef1227920628e7b811ff30"; + sha256 = "1sws2d7gh37ra86nk1pn2j0sgqc7nlaiaqg0z34vxv1qrc1wc33q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2023-10-10"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "daf59744f60e34cbb48a40a092e9e735553b6f21"; - sha256 = "0mlfnhyz1daxmrfvvqmwpcqpqkl4nd5dqwz4ac539ffaca2mf6zb"; + rev = "ca5fa5326fc2b2ebd3269176594c4341ad720ac5"; + sha256 = "16pqbn4i23j3ynzii5cszfqwrbz54cd8d99hqkqamvsm36q9m5b7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -9860,24 +9872,24 @@ final: prev: telescope-symbols-nvim = buildVimPlugin { pname = "telescope-symbols.nvim"; - version = "2023-02-19"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-symbols.nvim"; - rev = "f2060117d965df4a626f068a4ebbd8ee051aa076"; - sha256 = "1g9pj2g8l2rkz6szrijw56l1hd7lfac8i3g4fyvhi3x4xqjnml3h"; + rev = "a6d0127a53d39b9fc2af75bd169d288166118aec"; + sha256 = "07y1qhiv1qc5ip91l7w1dg59pkzchhz2qxcxm7ghhby47pvqv0yd"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; - version = "2023-11-08"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "0fc69ebbf178631b8ab76745459fade062156ec5"; - sha256 = "16ri6gxy4pgjf2rxxnd6p0i1ibaz08sd31n2v40n6y84is2nywrd"; + rev = "c261d903a78c2cda47a5e44488621f10f9dd7fcf"; + sha256 = "13clvq5zhhf6msawjsf42bja0avhngzzq0c0v5jfv2qzpdgbl5k2"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; @@ -9957,12 +9969,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-11-16"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "18774ec7929c8a8003a91e9e1f69f6c32258bbfe"; - sha256 = "1vihb6l5xiqbrs1g4c1blpkd0c995hwv2w6sr5b86zzmk70g0c7k"; + rev = "84c5a71d825b6687a55aed6f41e98b92fd8e5454"; + sha256 = "0a0kj9ixsqny8jxfialq4wxxg7rgl97cgp1cgv5n0lnyw3xkbgbi"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10065,12 +10077,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-11-18"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "65fcc8fb79ceef644af6861558bb534562ef6c0e"; - sha256 = "12dhchvn9mgs3pndiq6bnjn44ixx3famf5ad3vhhw0h7331p7v9v"; + rev = "1680642717be198d5b16fc4de9b8080d77111270"; + sha256 = "1hi1j2xnbqy0zmm06zfgwmikl6hphgkhbnhvdagap9h4nifpn9vz"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10198,12 +10210,12 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-10-02"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "c80844fd52ba76f48fabf83e2b9f9b93273f418d"; - sha256 = "19rbq39m7c1v9yrfmlwmfmxgv5d9bwcjbgjdp3cin409fnl4rv6b"; + rev = "6b334b9d1266b0f58ab1b6965c1e5b7eb5c34523"; + sha256 = "1fcgvgr2aaprmkw5jxd79c75i1azj8al4cmnswxkiqj0024q4bpb"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -10342,12 +10354,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2023-11-16"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "11f50fb66132c0bac929533b64536a8a7c490435"; - sha256 = "10dw4v8z8akgbp745f4ir0jnspxa1lji7adpgqa9fvkw78yws1n1"; + rev = "7911a0aa27e472bff986f1d3ce38ebad3b635b28"; + sha256 = "1sfsi7fxilws81svc8c0y2a1r6ky99xw9pfpnn5hfhvh9q16ar8i"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -10378,12 +10390,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-11-12"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "e72561f0023860eb83bd7680573b05ecfc016c55"; - sha256 = "1i9ydjr9fzhwxf55451p4i0l4mnflp9gziyxz7z5w06qa1ya7cvd"; + rev = "8b1d2962875b8701c830199f042b74663b6a3a7f"; + sha256 = "0yws4pfzzbz49shk99r4hblxqqxfjbqj2sh52ssjff2hk6is804c"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10426,12 +10438,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-11-16"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "fe51253418442af7c5e5884e084bdc574b5be5fb"; - sha256 = "12zpkskk81nagai3rip7ak0k7nz5imj07bphkalchf6lrr464bli"; + rev = "d56c7c469b52448164d078e26802b2e3071b17b0"; + sha256 = "1xflz3f5qm5injgzag7c4l2k4pflhv4knd5gpsxryzyxizlxkadl"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10522,12 +10534,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-11-07"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "1d242f09a4e8cd20589a3cf48f0ac3830246f14d"; - sha256 = "126319l699a16b862y33a03zlpzbackbvn6d4brnabbmanisd56n"; + rev = "61c56c7865ac9708cb4615ff0281e94297f82c1f"; + sha256 = "1rq47x48dgsvs0z5hqmb87kba8rkz1w178cbshxjwxzb92v701qc"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -11374,12 +11386,12 @@ final: prev: vim-codefmt = buildVimPlugin { pname = "vim-codefmt"; - version = "2023-08-22"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "03b8f306895137721d9e34ff8d3054cced89661a"; - sha256 = "059z2gmi32vl078nna58w56fkgn66y80jjb30qigr4gxlgn4r1y5"; + rev = "c6730fb9c0d17060ea0caf5b9bd3090e86f6a14d"; + sha256 = "0gn779c2z44gcxygjsb2spcsa9dkfxii6b27i1irnllmzkys18p4"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -11578,12 +11590,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2023-10-27"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "fecf5a3ecfb1869f34252c7c27351de99f01ab0e"; - sha256 = "18s05nvhfx56hqjg59ypvzrk7jm70c1yazic01i9pjznv5fpcnrg"; + rev = "738cfc2ea6a1510fe23cba9006fef9291be70f7b"; + sha256 = "1j3kga4iy6n8814j33zpxxyk4z7lxwqdnjdd70mhpybiw9ydazny"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -11602,12 +11614,12 @@ final: prev: vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2023-09-29"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "95fd22469507e86b78aa55d868c14108adee2881"; - sha256 = "049bqzh61rj3xril9mxb8h75jr074126pgvq65c90h4rm9ddk4ql"; + rev = "9ddb0623e69d696b7a8355b93e3950a8dc6e00a0"; + sha256 = "1ihfxy0diqhbcaxj23pqmnfh1wshx2s4id5r574vb27k929han2s"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -11926,12 +11938,12 @@ final: prev: vim-erlang-tags = buildVimPlugin { pname = "vim-erlang-tags"; - version = "2022-04-02"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-tags"; - rev = "cf6e9319818a6737dc9b79b7fa53fe4cdfc65139"; - sha256 = "1sk3z35svv2dznmvw9cgjm1731lgq34gai92c5vy6sxdbn6h1sbw"; + rev = "a7b106215f05e7dd4cd20cf5fc29071cceb5fca0"; + sha256 = "1gc5nprzwi6alxk7wclvvdxllwdzrwbmc6zdbhpa33igygvws4gw"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; @@ -12070,12 +12082,12 @@ final: prev: vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2023-11-14"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "b1d93789faf8bfe1f3e17eec03b8312c2939fcf2"; - sha256 = "11rykxacg9qlwyf0j4p6w8qqjr5yi1inmghyb4mvd5d0zp61p5w0"; + rev = "3f01a623376957437f9376327637491b74719e38"; + sha256 = "16az2qg9a3r466b9s4agqvxnsx99wpqlw8kn8dxcg94hxrgg35dc"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -12298,12 +12310,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2023-10-02"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1401b576c6ac382529188d3d26cff866139f2f9a"; - sha256 = "1i6k7i3dqzx825vhp1y2i7ca1i0y8bclkj13vnwws6drw3q9gbrg"; + rev = "97327927551d519f8f035f6f12f7bca041fed665"; + sha256 = "1kby6q5qi94i1jbb9vnl8llv55yvafap0w02hfm373rid00yi6fz"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12454,12 +12466,12 @@ final: prev: vim-helm = buildVimPlugin { pname = "vim-helm"; - version = "2022-08-22"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "towolf"; repo = "vim-helm"; - rev = "c2e7b85711d410e1d73e64eb5df7b70b1c4c10eb"; - sha256 = "1khisqaiq0gvjn2p3w42vcwadcbcs2ml5x6mi3gaclp7q0hyc19m"; + rev = "fc2259e1f8836304a0526853ddc3fe27045be39a"; + sha256 = "10al5is3x2a2383023rn8p9q056mgsc6dhyblxj48xb32rsmlf23"; }; meta.homepage = "https://github.com/towolf/vim-helm/"; }; @@ -12888,16 +12900,28 @@ final: prev: vim-kitty-navigator = buildVimPlugin { pname = "vim-kitty-navigator"; - version = "2023-05-25"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "c3d8aaaa61717b2c142ff39553fcab709fd606a7"; - sha256 = "0p6bp1p1vmm5ps29dvhvmq7dc56zqnkmzzfbb6fyk58nf7cr58v9"; + rev = "2aafc20a0a4eb3efa757db51868a2ab181e88690"; + sha256 = "0f298z3mcisja1h6z1f1smj9b3kq232bkvjwj9xyavhr0fpq6h9f"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; + vim-lark-syntax = buildVimPlugin { + pname = "vim-lark-syntax"; + version = "2023-10-10"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "vim-lark-syntax"; + rev = "e59976afd02b4c5ac36818ad0076c04c1584336a"; + sha256 = "00vham3ar63g0jxrr01rbcwzq7381mml0qasgywsvzbfmc7gr5ig"; + }; + meta.homepage = "https://github.com/lark-parser/vim-lark-syntax/"; + }; + vim-lastplace = buildVimPlugin { pname = "vim-lastplace"; version = "2023-08-24"; @@ -13092,12 +13116,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-11-11"; + version = "2023-11-25"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "ee2bb88833766ed184a77d4caa1e43d0821eaeb2"; - sha256 = "1bq745cx1ybzi84zjm6lj3mzy4bz5id5fs07jkvipakdpp44bxsa"; + rev = "3af8f3b38effc4a631a15bb283a4b701c251275d"; + sha256 = "1qca60s39q0w7l4zhj63jarh26dkqik8pw8ncwlbkinvfv5h3dbi"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -13249,12 +13273,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2023-11-05"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "d30b72d20f01478a8486f15a57c89fe3177373db"; - sha256 = "0zlficdwybcz8mvzv70vp4mkzrwpmvp3v0dq88fyimyajyxi1aqp"; + rev = "269f9bea87e20a01438085eb13df539929a12727"; + sha256 = "0ca3fhdr6pp77z72lxlhlkzi1ng713nfzvyywmq8a31z8j2vkh87"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -13573,12 +13597,12 @@ final: prev: vim-ocaml = buildVimPlugin { pname = "vim-ocaml"; - version = "2023-07-04"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "e3d4d3225f58d43131c5934bf010598a76ea100e"; - sha256 = "0a8409j5690a21ld02rgpmlf3qgnp0nz3wsabf9fsi9r3caz7chm"; + rev = "21453ca6a7bbf7e189a62e72ced5d440bc7fd625"; + sha256 = "1qlnj55qvxw8q8s66za9nj2fr19i284a74p72i60ywn1pp4kk64r"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -13765,12 +13789,12 @@ final: prev: vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; - version = "2023-01-10"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "4268535e1d33117a680a91160d845cd3833dfe28"; - sha256 = "0wd6fxv3l19rh7a6zfqi7ylcd1wjk8haiix7cq3zzyvq3zfidp0z"; + rev = "16939cda184ff555938cc895cc62477c172997f9"; + sha256 = "1rk3iqqzckrni1qznv1rmi63lf2h2qcis6z7priqn7zi2v41jgpa"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -14017,12 +14041,12 @@ final: prev: vim-ps1 = buildVimPlugin { pname = "vim-ps1"; - version = "2023-10-13"; + version = "2023-11-28"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "7d0c8581e774cab8198bafa936e231b6f4c634e6"; - sha256 = "07ac71a09qcl1flavkwazd4df6n8v56cqj3phff3f12p5sfkmy1y"; + rev = "308aac5449ccce54d09a669afc41326ae848d731"; + sha256 = "0akpwjpm66zyjx9vzlzy98dsxv556maz4pbk1grv14bxzz84m4vi"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -14545,12 +14569,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2023-11-01"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "b039190177d97a968d80518470910aae7faf182a"; - sha256 = "18yanygh3an4vak8zdj242pvqf557pg7ybfcnzrl0052vr7s3pf8"; + rev = "ec4ff7e9c9b274e93295924e59c82b4f51e2ae42"; + sha256 = "04gsma772cf6rxig2b3d37pvmv3y7sg7qjczkr5fjahsxafr4rpg"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -14822,12 +14846,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-11-15"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "6d054a713d601291c01c42197796644cf00ca9f2"; - sha256 = "0lf82ka9x1fkgczqxkbvlqygp6glcn1baq8ix0y60jn3kqccpm4s"; + rev = "d11dc6f9c3e2f062646e3e265f878dcdfbb6a8ca"; + sha256 = "1kr1shaa6kcwhsv1g6cv2m6n6dvbg0w5rk5nn12804g5i5g2svbd"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15266,12 +15290,12 @@ final: prev: vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2023-09-08"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "6d0c9f8e7deac8a90c51d4c1e69068cb86361933"; - sha256 = "15h2zij39zd10m16g7vmy60y718mldmchnwlvfp9pb8x2q9y8yv2"; + rev = "8d13283a15b077e64ff41081792b998154df76ef"; + sha256 = "05ivzp08fhl6agcmiwclpf5mlq8s4cf4jsh8z5v5sjmahdvh45mk"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -15554,12 +15578,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2023-11-08"; + version = "2023-11-26"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "66617adda22d29c60ec2ee9bcb854329352ada80"; - sha256 = "01sxg72xbvakdzc73ilkziyl8vl5qxkahfb293vlhy37hx3gbbzi"; + rev = "c03345e5adb171e4bfa9fca530dc01216e2819aa"; + sha256 = "1z6xy63fhdvaiwv4ay3njrwfarg8a2rxingnl9knwrni7q26gw4p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15567,12 +15591,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-11-15"; + version = "2023-11-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a630f0f75d9468d10c9125f2f1b0049e479c2f54"; - sha256 = "0f1p93jmhfp6fvl29v58rgwcvqa5lh1ks44w7gp6yh2w0i78s200"; + rev = "941485f8b046ac00763dad2546f0701e85e5e02c"; + sha256 = "0yxr0k9nflczrgdk1k9dybic4v1yg6pxrnnyg2nnwy14n54z7f2x"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15639,12 +15663,12 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2023-10-01"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "58dabc027909330970ac549e52bf799a723878c5"; - sha256 = "0xb385781kll7hrhgm7nw7frjx2fwd2gzriwn9gby2s7m6yx8xib"; + rev = "290b815cd5a5ff1fb65a48936633d93e2bf14dbd"; + sha256 = "1hqnczyyg21lsv4j3kvp0w84xm0fxzvdmgakwx2q1wg3x1g4ybcf"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -16024,12 +16048,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-11-17"; + version = "2023-11-29"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "a8dfb969e76d1a0752d98b5347be9ffb9bca9592"; - sha256 = "07xmcvb06w4khjc2z8h3i1c63fhkk4d76xjzwxs8lhzwfm4w3n86"; + rev = "919d1f786338ebeced798afbf28cd085cd54542a"; + sha256 = "1lwd4kvz52zkrn6wyh9k58pvcg4aas99c5ddzhsi76g31fg2ix8n"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16060,12 +16084,12 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2023-04-21"; + version = "2023-11-27"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "0e2c7d36b766dcebba2d8a3a0639784446dea086"; - sha256 = "1q3a6ix01wmw0qkir0v246gjp5dxr30ih0h0q28gv3s2hfk75a4w"; + rev = "7efd788d2e7b2d0a923cb6dabad7e2c11ab7aa95"; + sha256 = "0pnqx6jli9pwqs6h2dsvh7q05gchama7zcpr91zp2jabacbanycf"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -16120,12 +16144,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-10-30"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e89e67da3237d965ab10230de30071d1fdcf0b02"; - sha256 = "067w9rsp9srckxb4fyghy73cx50p5xg00l1x2fj4nsahv05bigkr"; + rev = "f50f9834e522b62ea89a84775091c1cf89af57a4"; + sha256 = "0fcc0h2xk8gjb7jy0xbql2vjv8ik7rfzbakxbcz860xjbcblpsqq"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3e80713f8871..b58346340309 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -25,6 +25,18 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda"; }; + angular = buildGrammar { + language = "angular"; + version = "0.0.0+rev=624ff10"; + src = fetchFromGitHub { + owner = "steelsojka"; + repo = "tree-sitter-angular"; + rev = "624ff108fe949727217cddb302f20e4f16997b1c"; + hash = "sha256-ROmM6GEhKLtNPUK3W4BOTRdxS2VcIpuRqdF18nrSsXk="; + }; + generate = true; + meta.homepage = "https://github.com/steelsojka/tree-sitter-angular"; + }; apex = buildGrammar { language = "apex"; version = "0.0.0+rev=82ee140"; @@ -171,12 +183,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=1648e21"; + version = "0.0.0+rev=dd5e597"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "1648e21b4f087963abf0101ee5221bb413107b07"; - hash = "sha256-WvkHtw8t14UNqiJvmS9dbGYQSVVzHS9mcWzxq+KLMnU="; + rev = "dd5e59721a5f8dae34604060833902b882023aaf"; + hash = "sha256-DlnGIky33CuRKkVVS+tOTBLVOVzASXqdaUrZawh6LZc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -248,12 +260,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=5153dbb"; + version = "0.0.0+rev=cf10fc3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "5153dbbc70e4cc2324320c1bdae020d31079c7c0"; - hash = "sha256-0eC2cm/cP9BLfNKsubJd4S4BHF2nJdx/OCNJNC4ur6Q="; + rev = "cf10fc38bc24faf0549d59217ff37c789973dfdc"; + hash = "sha256-Pm8aZnsw2fKRA0Cz0sOdcWh2GX7ty3wy34OfUtxmBds="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -303,12 +315,12 @@ }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=fec7d37"; + version = "0.0.0+rev=98c7b3d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"; - hash = "sha256-f3+pvJtULuJ6SHcmrMYyvreSAeEsq3L2+5V3dhloaj8="; + rev = "98c7b3dceb24f1ee17f1322f3947e55638251c37"; + hash = "sha256-+30AJq3L30QmLXvTnePGW39crd7mLBUJ+sGsF7Wd9qI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -326,12 +338,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=d33ee2c"; + version = "0.0.0+rev=2c6e806"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "d33ee2caab572f7b46cef12e090331b9ed1c02e2"; - hash = "sha256-9fQ0z7DozjGdcQZG36w419mFXIVDeafkG+ciQHgh0EE="; + rev = "2c6e806949197e7898910c78f514a3b7ff679068"; + hash = "sha256-JAShJo+jDv4kzFCPID0C3EokmeiWxMVcJoEsVOzKBEw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -371,12 +383,12 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=cc26cbf"; + version = "0.0.0+rev=53b4137"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"; - hash = "sha256-r23ycLCR79Ow4eI8rK03B3M1loU8/7K8dDrqBIPSAS0="; + rev = "53b4137bd37e726116ea918139767f982a1584d8"; + hash = "sha256-eHH6PiOR1xlIYFY2OcnvVVQanfAuJMkbsvDy9Wjm80U="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -437,12 +449,12 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=a3bfa1a"; + version = "0.0.0+rev=dd7ef38"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xml"; - rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"; - hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q="; + rev = "dd7ef38c74d8430da729b4da815e4c40776e03bb"; + hash = "sha256-6uQ9IeR4P5VXVvFA2KURDtjuYMMj9CwLHvI1dZ1B9L4="; }; location = "tree-sitter-dtd"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; @@ -538,15 +550,26 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=35ae91b"; + version = "0.0.0+rev=5694277"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "35ae91b2e9f5514c0ad6d6887f9859f28907c7d5"; - hash = "sha256-sA1Sy2yHBACDlicLYX+BLdcy4cnpleaYYVcjPcgHtW0="; + rev = "56942778b5791d07949e6c7b6093e01aba5b7ab4"; + hash = "sha256-0a36KKjacSbVb8zXaq2SHPw8njkZLb5rRWoaEUdsYyA="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; + facility = buildGrammar { + language = "facility"; + version = "0.0.0+rev=a525796"; + src = fetchFromGitHub { + owner = "FacilityApi"; + repo = "tree-sitter-facility"; + rev = "a52579670e2b14ec03d410c3c980fafaf6d659c4"; + hash = "sha256-YHtKuR3AysJXV1JDEBmPCSPOpUxJSnxkbX3/y/tX8ws="; + }; + meta.homepage = "https://github.com/FacilityApi/tree-sitter-facility"; + }; fennel = buildGrammar { language = "fennel"; version = "0.0.0+rev=5171959"; @@ -582,12 +605,12 @@ }; foam = buildGrammar { language = "foam"; - version = "0.0.0+rev=09e0344"; + version = "0.0.0+rev=04664b4"; src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; - rev = "09e03445f49290450589c5d293610ab39434e3e4"; - hash = "sha256-+ZNLgv0LbXET0WoalAaxo2WjVy0ranPtdOw1CCseqcM="; + rev = "04664b40c0dadb7ef37028acf3422c63271d377b"; + hash = "sha256-cIeYuYti/rzMivwRU//zzhMXJsTOMBveLK2zB4qRWGI="; }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; @@ -736,12 +759,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=c9082ed"; + version = "0.0.0+rev=5bb58a6"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "c9082edab87b145e97090b133167cb53626d9f58"; - hash = "sha256-bwuPykagBFfTJ87C5oNcUWmKs9eBBYPZ0UOC/8zbbF8="; + rev = "5bb58a6a5b0941d4e1256c6335e50d9780e74dde"; + hash = "sha256-k2hs8psjVJ2HcNZoVaM4k81uccmacqbl7VxDXXOAQzA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -934,12 +957,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=ac65c93"; + version = "0.0.0+rev=8b10fab"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "ac65c934b3214e96e0f854be009a3bd51549bd14"; - hash = "sha256-rTBal4RBOFBKfb9cydvWH+JtCCMOlnnGMPb2X7LXRjE="; + rev = "8b10faba024b536dc85f76e0c678f573b1776034"; + hash = "sha256-9bl7RhZjQOqBOePB4Lx3FLR79svMSh7ZVe+YlFv27WU="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1666,12 +1689,12 @@ }; pod = buildGrammar { language = "pod"; - version = "0.0.0+rev=ea5d557"; + version = "0.0.0+rev=39da859"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-pod"; - rev = "ea5d557cbd185cdcb5efcfdb6bc846fe909d86ae"; - hash = "sha256-CFPfpFQYlaryMX/k6tBT9k0WbQRz2vdVzh++lIVYe80="; + rev = "39da859947b94abdee43e431368e1ae975c0a424"; + hash = "sha256-sMUlAtl0IaykKlEhOiAkdrLNNJiCS0L7gj7+2WHwO5U="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; }; @@ -1719,6 +1742,17 @@ }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql"; }; + properties = buildGrammar { + language = "properties"; + version = "0.0.0+rev=9725327"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-properties"; + rev = "97253273bdf8b63546c8006e71ba155ecc27069e"; + hash = "sha256-pzAoRPBZRqlchnaYrKixrgjTZZ3nLzoOD5MZCqS7trI="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-properties"; + }; proto = buildGrammar { language = "proto"; version = "0.0.0+rev=e9f6b43"; @@ -1885,6 +1919,17 @@ }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; + rbs = buildGrammar { + language = "rbs"; + version = "0.0.0+rev=192eda4"; + src = fetchFromGitHub { + owner = "joker1007"; + repo = "tree-sitter-rbs"; + rev = "192eda46774fd0281cdd41d372d5b4da86148780"; + hash = "sha256-Bxgh7K3j0oPvZw7JX3kXFmaEAEKefB0A9ATmrbvXrB8="; + }; + meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; + }; re2c = buildGrammar { language = "re2c"; version = "0.0.0+rev=47aa19c"; @@ -2040,6 +2085,17 @@ }; meta.homepage = "https://github.com/serenadeai/tree-sitter-scss"; }; + slang = buildGrammar { + language = "slang"; + version = "0.0.0+rev=11526ab"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "tree-sitter-slang"; + rev = "11526ab1a2514c7302f3c4af60b0ebc992cee086"; + hash = "sha256-iDj2H1ScR478eE/ppxIDiLOx1Bb8e2KsWcWrKhlHACM="; + }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; + }; slint = buildGrammar { language = "slint"; version = "0.0.0+rev=00c8a2d"; @@ -2064,12 +2120,12 @@ }; smithy = buildGrammar { language = "smithy"; - version = "0.0.0+rev=cf8c7eb"; + version = "0.0.0+rev=8327eb8"; src = fetchFromGitHub { owner = "indoorvivants"; repo = "tree-sitter-smithy"; - rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0"; - hash = "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w="; + rev = "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"; + hash = "sha256-6z2Psw+cjC11CXoGOJ/lkBPJXKqECCSrhchOiAPmd14="; }; meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; @@ -2132,12 +2188,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=d8fffdf"; + version = "0.0.0+rev=a3ea0e4"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "d8fffdf0902bf55994fd2e8a0a46e221ca988589"; - hash = "sha256-PowCYtL56lLGJaXFEdtPGAXaqYF0/u/mqDCjXHmyps0="; + rev = "a3ea0e4143a617fc2c4ccf29c41e0ba7a1ff6ab9"; + hash = "sha256-VwkehcELs+t+1GjiOiPs1UQT+0E7OZaXaWTyjFWlMto="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2154,12 +2210,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=1651e63"; + version = "0.0.0+rev=0969813"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "1651e637d57c667708add5440d3726f07e97d953"; - hash = "sha256-jshQhWIeMcsUA7g2RGuH3DSfBfRhRx9dMOJVm/92Jkw="; + rev = "096981397385f49833dfd66037fa98081bbd9ef9"; + hash = "sha256-WpgIir4V4X2XUTceBwZyNFQE3ePDBqjlBRS57pF8ZO4="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2220,12 +2276,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=b3bfaad"; + version = "0.0.0+rev=f1a48a3"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "b3bfaad89426a062c2a5d971cfebb7262f8cff62"; - hash = "sha256-8rPtZmxfg1jHGqD4oKWfJpsVtk3cPPuwylJOWGXhtB0="; + rev = "f1a48a33a7ceaf8817f7a340ea4ef1b549ffa176"; + hash = "sha256-koMsIPFCvmJ/zIPOcv/ZSyXQSBjbFhGBq8r3IXCPWdQ="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2344,12 +2400,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=d99cb5c"; + version = "0.0.0+rev=c5fae9e"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "d99cb5c77bb0e733176d607a0875ac30e17e1e72"; - hash = "sha256-ShZlFHokmy3hhfTeh+/anz7a2bGDwWAdWIdi3X/lchQ="; + rev = "c5fae9e4ad9f483fb6232a8688a2c940be6b496b"; + hash = "sha256-k2NN7vRIDsq/J4J6T9KEAwSht7JBtU9Ul7tUL/TrU58="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2502,12 +2558,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=2f24b03"; + version = "0.0.0+rev=165ed9f"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "2f24b0377ddb865eb4285634f6945cb4ee3f395c"; - hash = "sha256-DLtG1RzoDC252O1FItP9vDZyt/MpV4bR7tcMSOLINWA="; + rev = "165ed9fda0be82ff26639dd8cf5d93fe7f7432a0"; + hash = "sha256-iH4k/begatiLc0BoAezWkhbdIjG5BHlduPMRUx/dNaI="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2602,12 +2658,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=f6423ec"; + version = "0.0.0+rev=9573195"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "f6423ecace1ef34f57dc77db031504ce21ebfaaf"; - hash = "sha256-uIUIXHxHWedJ5oH1u/88degVAzklzN97AYc5B39nFwE="; + rev = "9573195e753fa0d303e65d8237d3902159708457"; + hash = "sha256-DS0PJU9OlER+izTZTyiSGRIs0tGgEKImrEyFbj2b1wM="; }; location = "libs/tree-sitter-wing"; generate = true; @@ -2626,12 +2682,12 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=a3bfa1a"; + version = "0.0.0+rev=dd7ef38"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xml"; - rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"; - hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q="; + rev = "dd7ef38c74d8430da729b4da815e4c40776e03bb"; + hash = "sha256-6uQ9IeR4P5VXVvFA2KURDtjuYMMj9CwLHvI1dZ1B9L4="; }; location = "tree-sitter-xml"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index a27f8650f425..ce74644b951e 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -847,7 +847,7 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }; - neotest = super.neorg.overrideAttrs { + neotest = super.neotest.overrideAttrs { dependencies = with self; [ plenary-nvim ]; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index ff93512e5c17..7c8ce8972656 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -214,6 +214,7 @@ https://github.com/ctrlpvim/ctrlp.vim/,, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/glepnir/dashboard-nvim/,, +https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/kristijanhusak/defx-git/,, https://github.com/kristijanhusak/defx-icons/,, https://github.com/Shougo/defx.nvim/,, @@ -278,7 +279,7 @@ https://github.com/freddiehaddad/feline.nvim/,, https://github.com/bakpakin/fennel.vim/,, https://github.com/lambdalisue/fern.vim/,, https://github.com/wincent/ferret/,, -https://github.com/j-hui/fidget.nvim/,legacy, +https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, @@ -1086,6 +1087,7 @@ https://github.com/peitalin/vim-jsx-typescript/,, https://github.com/mroavi/vim-julia-cell/,HEAD, https://github.com/NoahTheDuke/vim-just/,, https://github.com/knubie/vim-kitty-navigator/,, +https://github.com/lark-parser/vim-lark-syntax/,HEAD, https://github.com/farmergreg/vim-lastplace/,, https://github.com/xuhdev/vim-latex-live-preview/,, https://github.com/ludovicchabant/vim-lawrencium/,, diff --git a/nixpkgs/pkgs/applications/editors/viw/default.nix b/nixpkgs/pkgs/applications/editors/viw/default.nix index 0ba381901b98..ad47edfe83e4 100644 --- a/nixpkgs/pkgs/applications/editors/viw/default.nix +++ b/nixpkgs/pkgs/applications/editors/viw/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lpan/viw"; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "viw"; }; } diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index b583e8135609..1b804de2b304 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -276,8 +276,8 @@ let mktplcRef = { name = "nix-env-selector"; publisher = "arrterian"; - version = "1.0.9"; - sha256 = "sha256-TkxqWZ8X+PAonzeXQ+sI9WI+XlqUHll7YyM7N9uErk0="; + version = "1.0.10"; + sha256 = "sha256-b3Sr0bwU2VJgl2qcdsUROZ3jnK+YUuzJMySvSD7goj8="; }; meta = { license = lib.licenses.mit; @@ -591,12 +591,12 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.9.5"; - sha256 = "sha256-KqWSQ+p5KqRVULwjoWuNE+lIEYkaUVkeOwMpXUxccqw="; + version = "1.10.1"; + sha256 = "sha256-VZQ3dpwj4RWZuyMba8DM7+JcIBSYB8zimZOkP5mJbms="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; - license = lib.licenses.mit; + license = lib.licenses.unfree; downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client"; maintainers = [ lib.maintainers.drupol ]; }; @@ -618,10 +618,14 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.9.9"; - sha256 = "sha256-QyB6DtKe9KH2UizLZQfP4YlHz2yF8H9Ehj+M+OdIYe4="; + version = "0.11.30"; + sha256 = "sha256-1CxyvQu7WQJw87sTcpnILztt1WeSpWOgij0dEIXebPU="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; + description = "Tailwind CSS tooling for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss"; + homepage = "https://github.com/tailwindlabs/tailwindcss-intellisense"; license = lib.licenses.mit; }; }; @@ -969,15 +973,15 @@ let mktplcRef = { name = "composer-php-vscode"; publisher = "devsense"; - version = "1.36.13428"; - sha256 = "sha256-dzRuD0XBWU+xUtr86eN8zbZ6bVIq1BP0/EqgQG4JbvY="; + version = "1.41.14332"; + sha256 = "sha256-qRgncn6u40Igd40OZShRHXqdgjFqRLNb0hPirwc+DoU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog"; description = "A visual studio code extension for full development integration for Composer, the PHP package manager."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=DEVSENSE.composer-php-vscode"; homepage = "https://github.com/DEVSENSE/phptools-docs"; - license = lib.licenses.asl20; + license = lib.licenses.unfree; maintainers = [ lib.maintainers.drupol ]; }; }; @@ -987,25 +991,25 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - sha256 = "sha256-x4Vsr/79vZuNPGQqwOVdIMi2Ba9DfnKM1AjxCZbzJms="; + sha256 = "sha256-8i5nRlzd+LnpEh9trWECxfiC1W4S0ekBab5vo18OlsA="; }; "x86_64-darwin" = { arch = "darwin-x64"; - sha256 = "0c9jcjavkjiv92cd4wrvgcv70igghi5ha96hg7h63cgmxg7b87gk"; + sha256 = "14crw56277rdwhigabb3nsndkfcs3yzzf7gw85jvryxviq32chgy"; }; "aarch64-linux" = { arch = "linux-arm64"; - sha256 = "0b3w3ssxymf9p1h4amnqimbsjf1wpxsi55b05wgqwh2w2zfxd91l"; + sha256 = "1j1xlvbg3nrfmdd9zm6kywwicdwdkrq0si86lcndaii8m7sj5pfp"; }; "aarch64-darwin" = { arch = "darwin-arm64"; - sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + sha256 = "0nlks6iqxkx1xlicsa8lrb1319rgznlxkv2gg7wkwgzph97ik8bi"; }; }; in { name = "phptools-vscode"; publisher = "devsense"; - version = "1.36.13428"; + version = "1.41.14332"; } // sources.${stdenv.system}; nativeBuildInputs = [ @@ -1026,7 +1030,7 @@ let description = "A visual studio code extension for full development integration for the PHP language."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=DEVSENSE.phptools-vscode"; homepage = "https://github.com/DEVSENSE/phptools-docs"; - license = lib.licenses.asl20; + license = lib.licenses.unfree; maintainers = [ lib.maintainers.drupol ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; }; @@ -1036,15 +1040,15 @@ let mktplcRef = { name = "profiler-php-vscode"; publisher = "devsense"; - version = "1.36.13428"; - sha256 = "sha256-/CT83LdQkEvsWrQX30bgnklgGKduYC0LqZ8gaexqu60="; + version = "1.41.14332"; + sha256 = "sha256-u2lNqG6FUhWnnNGtv+sjTbP/hbu4Da/8xjLzmPZkZOA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog"; description = "A visual studio code extension for PHP and XDebug profiling and inspecting."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=DEVSENSE.profiler-php-vscode"; homepage = "https://github.com/DEVSENSE/phptools-docs"; - license = lib.licenses.asl20; + license = lib.licenses.unfree; maintainers = [ lib.maintainers.drupol ]; }; }; @@ -1689,10 +1693,14 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.38.0"; - sha256 = "sha256-wOWouVz4mE4BzmgQOLQyVWsMadMqeUkFWHnruxStU0Q="; + version = "0.40.0"; + sha256 = "sha256-otAq6ul2l64zpRJdekCb7XZiE2vgpLUfM4NUdRPZX8w="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog"; + description = "Go extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=golang.Go"; + homepage = "https://github.com/golang/vscode-go"; license = lib.licenses.mit; }; }; @@ -2304,8 +2312,8 @@ let mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.9.1"; - sha256 = "sha256-GHD/i+QOnItGEYG0bl/pVl+a4Dvn7SHhICJ14VfqMjE="; + version = "0.9.2"; + sha256 = "sha256-/2ZD5LOQ1vTIKab2qX+5AqNqaRs90MNz1jUMDaV1wUY="; }; buildInputs = [ @@ -3547,15 +3555,15 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.23"; - sha256 = "sha256-NauXoYTAka8qXNPYlW5g7r6NNX1x8cnvDRbEGkRsMoY="; + version = "0.0.25"; + sha256 = "sha256-qM+CLV8jWYkJWXZyELnR1H9pSWFifAOGqH+LgHr7nNA="; }; 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 ]; + maintainers = with lib.maintainers; [ tomasajt wackbyte defelo ]; }; }; @@ -3943,6 +3951,23 @@ let }; }; + ziglang.vscode-zig = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-zig"; + publisher = "ziglang"; + version = "0.5.1"; + sha256 = "sha256-ygxvkewK5Tf1zNIXxzu6D/tKYNVcNsU9cKij7d5aRdQ="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; + description = "Zig support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ziglang.vscode-zig"; + homepage = "https://github.com/ziglang/vscode-zig"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; + }; + }; + zxh404.vscode-proto3 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-proto3"; diff --git a/nixpkgs/pkgs/applications/editors/wily/default.nix b/nixpkgs/pkgs/applications/editors/wily/default.nix index 3fe756bcf72b..74d0bc156758 100644 --- a/nixpkgs/pkgs/applications/editors/wily/default.nix +++ b/nixpkgs/pkgs/applications/editors/wily/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.artistic1; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; + mainProgram = "wily"; }; } diff --git a/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix index a036e0532977..23ef7a0ef567 100644 --- a/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix +++ b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ wegank ]; + mainProgram = "wxHexEditor"; }; } diff --git a/nixpkgs/pkgs/applications/editors/xed-editor/default.nix b/nixpkgs/pkgs/applications/editors/xed-editor/default.nix index 85909af04e98..6013f8a699fe 100644 --- a/nixpkgs/pkgs/applications/editors/xed-editor/default.nix +++ b/nixpkgs/pkgs/applications/editors/xed-editor/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ tu-maurice bobby285271 ]; + mainProgram = "xed"; }; } diff --git a/nixpkgs/pkgs/applications/editors/xedit/default.nix b/nixpkgs/pkgs/applications/editors/xedit/default.nix index a6a29addc7a9..679d64d6cca4 100644 --- a/nixpkgs/pkgs/applications/editors/xedit/default.nix +++ b/nixpkgs/pkgs/applications/editors/xedit/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; + mainProgram = "xedit"; }; } diff --git a/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix index bd7c237e8c13..7d75bdce82ef 100644 --- a/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ candeira wegank ]; + mainProgram = "xmlcopyeditor"; }; } diff --git a/nixpkgs/pkgs/applications/editors/zee/default.nix b/nixpkgs/pkgs/applications/editors/zee/default.nix index 8de11fd5d59c..e7db019467ba 100644 --- a/nixpkgs/pkgs/applications/editors/zee/default.nix +++ b/nixpkgs/pkgs/applications/editors/zee/default.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/zee-editor/zee"; license = licenses.mit; maintainers = with maintainers; [ booklearner ]; + mainProgram = "zee"; }; } diff --git a/nixpkgs/pkgs/applications/editors/zile/default.nix b/nixpkgs/pkgs/applications/editors/zile/default.nix index cb1307d7ffb4..bafb1aa30385 100644 --- a/nixpkgs/pkgs/applications/editors/zile/default.nix +++ b/nixpkgs/pkgs/applications/editors/zile/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub AndersonTorres ]; platforms = platforms.unix; + mainProgram = "zile"; }; } diff --git a/nixpkgs/pkgs/applications/emulators/cemu/default.nix b/nixpkgs/pkgs/applications/emulators/cemu/default.nix index 3858ddf55b0d..98ac7c66dfe6 100644 --- a/nixpkgs/pkgs/applications/emulators/cemu/default.nix +++ b/nixpkgs/pkgs/applications/emulators/cemu/default.nix @@ -16,6 +16,7 @@ , hidapi , imgui , libpng +, libusb1 , libzip , libXrender , pugixml @@ -32,13 +33,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-47"; + version = "2.0-59"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-0N/bJJHWMHF+ZlVxNHV8t/1jFr3ER3GNF8CPAHVSsak="; + hash = "sha256-dw77UkhyJ+XJLYWT6adUuTd+spqNr3/ZOMLaAVWgzmc="; }; patches = [ @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { hidapi imgui libpng + libusb1 libzip libXrender pugixml diff --git a/nixpkgs/pkgs/applications/emulators/citra/default.nix b/nixpkgs/pkgs/applications/emulators/citra/default.nix index 41a018d9ea92..960cefc67871 100644 --- a/nixpkgs/pkgs/applications/emulators/citra/default.nix +++ b/nixpkgs/pkgs/applications/emulators/citra/default.nix @@ -9,19 +9,19 @@ let # Please make sure to update this when updating citra! compat-list = fetchurl { name = "citra-compat-list"; - url = "https://web.archive.org/web/20230807103651/https://api.citra-emu.org/gamedb/"; + url = "https://web.archive.org/web/20231111133415/https://api.citra-emu.org/gamedb"; hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU="; }; in { nightly = qt6Packages.callPackage ./generic.nix rec { pname = "citra-nightly"; - version = "1963"; + version = "2043"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-nightly"; rev = "nightly-${version}"; - sha256 = "0ggi1l8327s43xaxs616g0s9vmal6q7vsv69bn07gp71gchhcmyi"; + sha256 = "sha256-26M3uzqp4rUMOhr619UooupZT11B03IJfamUPNkceQk="; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { canary = qt6Packages.callPackage ./generic.nix rec { pname = "citra-canary"; - version = "2573"; + version = "2695"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-canary"; rev = "canary-${version}"; - sha256 = "sha256-tQJ3WcqGcnW9dOiwDrBgL0n3UNp1DGQ/FjCR28Xjdpc="; + sha256 = "sha256-090er4aUGze8bk3DIFZoa+/6EcJhr4bim3nWgZHs1mo="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/emulators/citra/generic.nix b/nixpkgs/pkgs/applications/emulators/citra/generic.nix index 8df720e60b79..21b60bb4056e 100644 --- a/nixpkgs/pkgs/applications/emulators/citra/generic.nix +++ b/nixpkgs/pkgs/applications/emulators/citra/generic.nix @@ -6,70 +6,93 @@ , lib , stdenv -, fetchFromGitHub , cmake , boost , pkg-config -, libusb1 +, catch2_3 +, cpp-jwt +, cryptopp +, enet +, ffmpeg +, fmt , glslang +, httplib +, inih +, libusb1 +, nlohmann_json +, openal +, openssl +, SDL2 +, soundtouch +, spirv-tools , zstd -, libressl -, enableSdl2 ? true, SDL2 -, enableQt ? true, qtbase, qtmultimedia, wrapQtAppsHook +, vulkan-headers +, vulkan-loader +, enableSdl2Frontend ? true +, enableQt ? true, qtbase, qtmultimedia, qtwayland, wrapQtAppsHook , enableQtTranslation ? enableQt, qttools , enableWebService ? true , enableCubeb ? true, cubeb -, enableFfmpegAudioDecoder ? true -, enableFfmpegVideoDumper ? true -, ffmpeg_4 , useDiscordRichPresence ? true, rapidjson -, enableFdk ? false, fdk_aac }: -assert lib.assertMsg (!enableFfmpegAudioDecoder || !enableFdk) "Can't enable both enableFfmpegAudioDecoder and enableFdk"; - -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname version src; nativeBuildInputs = [ cmake - glslang pkg-config + ffmpeg + glslang ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = [ boost + catch2_3 + cpp-jwt + cryptopp + # intentionally omitted: dynarmic - prefer vendored version for compatibility + enet + fmt + httplib + inih libusb1 - ] ++ lib.optionals enableQt [ qtbase qtmultimedia ] - ++ lib.optional enableSdl2 SDL2 + nlohmann_json + openal + openssl + SDL2 + soundtouch + spirv-tools + vulkan-headers + # intentionally omitted: xbyak - prefer vendored version for compatibility + zstd + ] ++ lib.optionals enableQt [ qtbase qtmultimedia qtwayland ] ++ lib.optional enableQtTranslation qttools - ++ lib.optionals enableCubeb cubeb.passthru.backendLibs - ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4 - ++ lib.optional useDiscordRichPresence rapidjson - ++ lib.optional enableFdk fdk_aac; + ++ lib.optional enableCubeb cubeb + ++ lib.optional useDiscordRichPresence rapidjson; cmakeFlags = [ - "-DUSE_SYSTEM_BOOST=ON" - "-DCITRA_WARNINGS_AS_ERRORS=OFF" - "-DCITRA_USE_BUNDLED_FFMPEG=OFF" - "-DCITRA_USE_BUNDLED_QT=OFF" - "-DUSE_SYSTEM_SDL2=ON" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + "-DUSE_SYSTEM_LIBS=ON" + + "-DDISABLE_SYSTEM_DYNARMIC=ON" + "-DDISABLE_SYSTEM_GLSLANG=ON" # The following imported targets are referenced, but are missing: SPIRV-Tools-opt + "-DDISABLE_SYSTEM_LODEPNG=ON" # Not packaged in nixpkgs + "-DDISABLE_SYSTEM_VMA=ON" + "-DDISABLE_SYSTEM_XBYAK=ON" - # We dont want to bother upstream with potentially outdated compat reports + # We don't want to bother upstream with potentially outdated compat reports "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON" "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically - ] ++ lib.optional (!enableSdl2) "-DENABLE_SDL2=OFF" + ] ++ lib.optional (!enableSdl2Frontend) "-DENABLE_SDL2_FRONTEND=OFF" ++ lib.optional (!enableQt) "-DENABLE_QT=OFF" ++ lib.optional enableQtTranslation "-DENABLE_QT_TRANSLATION=ON" ++ lib.optional (!enableWebService) "-DENABLE_WEB_SERVICE=OFF" ++ lib.optional (!enableCubeb) "-DENABLE_CUBEB=OFF" - ++ lib.optional enableFfmpegAudioDecoder "-DENABLE_FFMPEG_AUDIO_DECODER=ON" - ++ lib.optional enableFfmpegVideoDumper "-DENABLE_FFMPEG_VIDEO_DUMPER=ON" - ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON" - ++ lib.optional enableFdk "-DENABLE_FDK=ON"; + ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"; - postPatch = with lib; let + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + + postPatch = let branchCaptialized = (lib.toUpper (lib.substring 0 1 branch) + lib.substring 1 (-1) branch); in '' # Fix file not found when looking in var/empty instead of opt @@ -85,19 +108,17 @@ stdenv.mkDerivation rec { # Add versions echo 'set(BUILD_FULLNAME "${branchCaptialized} ${version}")' >> CMakeModules/GenerateBuildInfo.cmake - - # Devendoring - rm -rf externals/zstd externals/libressl - cp -r ${zstd.src} externals/zstd - tar xf ${libressl.src} -C externals/ - mv externals/${libressl.name} externals/libressl - chmod -R a+w externals/zstd ''; - # Fixes https://github.com/NixOS/nixpkgs/issues/171173 - postInstall = lib.optionalString (enableCubeb && enableSdl2) '' + postInstall = let + libs = lib.makeLibraryPath [ vulkan-loader ]; + in lib.optionalString enableSdl2Frontend '' wrapProgram "$out/bin/citra" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs} + --prefix LD_LIBRARY_PATH : ${libs} + '' + lib.optionalString enableQt '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${libs} + ) ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/emulators/darling/default.nix b/nixpkgs/pkgs/applications/emulators/darling/default.nix index cc4d7265ce28..d26aae29b2e3 100644 --- a/nixpkgs/pkgs/applications/emulators/darling/default.nix +++ b/nixpkgs/pkgs/applications/emulators/darling/default.nix @@ -4,6 +4,7 @@ , writeShellScript , fetchFromGitHub , fetchpatch +, nixosTests , freetype , libjpeg @@ -107,14 +108,14 @@ let ]; in stdenv.mkDerivation { pname = "darling"; - version = "unstable-2023-05-02"; + version = "unstable-2023-11-07"; src = fetchFromGitHub { owner = "darlinghq"; repo = "darling"; - rev = "557e7e9dece394a3f623825679474457e5b64fd0"; + rev = "34351655a40d2090e70b3033a577b8cdea967633"; fetchSubmodules = true; - hash = "sha256-SOoLaV7wg33qRHPQXkdMvrY++CvoG85kwd6IU6DkYa0="; + hash = "sha256-Jhr7Do15vms8bJ8AczVSkuWrC7gUR5ZvU9/PfCmGGcg="; }; outputs = [ "out" "sdk" ]; @@ -221,6 +222,8 @@ in stdenv.mkDerivation { $out/libexec/darling/usr/libexec/darling/mldr ''; + passthru.tests.nixos = nixosTests.darling; + meta = with lib; { description = "Open-source Darwin/macOS emulation layer for Linux"; homepage = "https://www.darlinghq.org"; diff --git a/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index d84ae907b179..185187a9e3b0 100644 --- a/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -390,7 +390,8 @@ in preBuild = "cd svn-current/trunk"; meta = { description = "Port of Final Burn Alpha ~2012 to libretro"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -400,7 +401,8 @@ in preBuild = "cd src/burner/libretro"; meta = { description = "Port of FBNeo to libretro"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -430,7 +432,8 @@ in makefile = "Makefile"; meta = { description = "FMSX libretro port"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -463,7 +466,8 @@ in core = "genesis-plus-gx"; meta = { description = "Enhanced Genesis Plus libretro port"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -524,7 +528,8 @@ in makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; meta = { description = "Port of MAME ~2000 to libretro, compatible with MAME 0.37b5 sets"; - license = "MAME"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -533,7 +538,8 @@ in makefile = "Makefile"; meta = { description = "Port of MAME ~2003 to libretro, compatible with MAME 0.78 sets"; - license = "MAME"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -542,7 +548,8 @@ in makefile = "Makefile"; meta = { description = "Port of MAME ~2003+ to libretro, compatible with MAME 0.78 sets"; - license = "MAME"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -552,7 +559,8 @@ in makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; meta = { description = "Port of MAME ~2010 to libretro, compatible with MAME 0.139 sets"; - license = "MAME"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -566,7 +574,8 @@ in enableParallelBuilding = false; meta = { description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; - license = "MAME"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -708,7 +717,8 @@ in makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ]; meta = { description = "Opera is a port of 4DO/libfreedo to libretro"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -782,7 +792,8 @@ in dontConfigure = true; meta = { description = "Fast MegaDrive/MegaCD/32X emulator"; - license = "MAME"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -901,7 +912,8 @@ in preBuild = "cd libretro"; meta = { description = "Port of SNES9x git to libretro"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -910,7 +922,8 @@ in makefile = "Makefile"; meta = { description = "Optimized port/rewrite of SNES9x 1.39 to Libretro"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -919,7 +932,8 @@ in makefile = "Makefile"; meta = { description = "Optimized port/rewrite of SNES9x 1.43 to Libretro"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -930,7 +944,8 @@ in makeFlags = [ "USE_BLARGG_APU=1" ]; meta = { description = "Optimized port/rewrite of SNES9x 1.43 to Libretro, with Blargg's APU"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; @@ -938,7 +953,8 @@ in core = "snes9x2010"; meta = { description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; - license = "Non-commercial"; + # Non-commercial clause + license = lib.licenses.unfreeRedistributable; }; }; diff --git a/nixpkgs/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules b/nixpkgs/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules deleted file mode 100644 index a4f32124d970..000000000000 --- a/nixpkgs/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules +++ /dev/null @@ -1,5 +0,0 @@ -# DualShock 3 over USB -KERNEL=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0268", MODE="0666" - -# DualShock 3 over Bluetooth -KERNEL=="hidraw*", KERNELS=="*054C:0268*", MODE="0666" diff --git a/nixpkgs/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules b/nixpkgs/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules deleted file mode 100644 index 6061debfbff8..000000000000 --- a/nixpkgs/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules +++ /dev/null @@ -1,14 +0,0 @@ -# DualShock 4 over USB -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", MODE="0666" - -# DualShock 4 Wireless Adapter over USB -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", MODE="0666" - -# DualShock 4 Slim over USB -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", MODE="0666" - -# DualShock 4 over Bluetooth -KERNEL=="hidraw*", KERNELS=="*054C:05C4*", MODE="0666" - -# DualShock 4 Slim over Bluetooth -KERNEL=="hidraw*", KERNELS=="*054C:09CC*", MODE="0666" diff --git a/nixpkgs/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules b/nixpkgs/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules deleted file mode 100644 index fb3ed3eec3f5..000000000000 --- a/nixpkgs/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules +++ /dev/null @@ -1,5 +0,0 @@ -# PS5 DualSense controller over USB hidraw -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ce6", MODE="0660", TAG+="uaccess" - -# PS5 DualSense controller over bluetooth hidraw -KERNEL=="hidraw*", KERNELS=="*054C:0CE6*", MODE="0660", TAG+="uaccess" diff --git a/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix b/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix deleted file mode 100644 index 88b3ddbb1750..000000000000 --- a/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, wrapQtAppsHook -, cmake -, pkg-config -, git -, qtbase -, qtquickcontrols -, qtmultimedia -, openal -, glew -, vulkan-headers -, vulkan-loader -, libpng -, libSM -, ffmpeg -, libevdev -, libusb1 -, zlib -, curl -, wolfssl -, python3 -, pugixml -, flatbuffers -, llvm_16 -, cubeb -, faudioSupport ? true -, faudio -, SDL2 -, waylandSupport ? true -, wayland -}: - -let - # Keep these separate so the update script can regex them - rpcs3GitVersion = "15409-fd6829f75"; - rpcs3Version = "0.0.28-15409-fd6829f75"; - rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c"; - rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk="; -in -stdenv.mkDerivation { - pname = "rpcs3"; - version = rpcs3Version; - - src = fetchFromGitHub { - owner = "RPCS3"; - repo = "rpcs3"; - rev = rpcs3Revision; - fetchSubmodules = true; - hash = rpcs3Hash; - }; - - passthru.updateScript = ./update.sh; - - preConfigure = '' - cat > ./rpcs3/git-version.h <<EOF - #define RPCS3_GIT_VERSION "${rpcs3GitVersion}" - #define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master" - #define RPCS3_GIT_BRANCH "HEAD" - #define RPCS3_GIT_VERSION_NO_UPDATE 1 - EOF - ''; - - cmakeFlags = [ - "-DUSE_SYSTEM_ZLIB=ON" - "-DUSE_SYSTEM_LIBUSB=ON" - "-DUSE_SYSTEM_LIBPNG=ON" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_WOLFSSL=ON" - "-DUSE_SYSTEM_FAUDIO=ON" - "-DUSE_SYSTEM_PUGIXML=ON" - "-DUSE_SYSTEM_FLATBUFFERS=ON" - "-DUSE_SYSTEM_SDL=ON" - "-DWITH_LLVM=ON" - "-DBUILD_LLVM=OFF" - "-DUSE_NATIVE_INSTRUCTIONS=OFF" - "-DUSE_FAUDIO=${if faudioSupport then "ON" else "OFF"}" - ]; - - nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; - - buildInputs = [ - qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM - ] ++ cubeb.passthru.backendLibs - ++ lib.optionals faudioSupport [ faudio SDL2 ] - ++ lib.optional waylandSupport wayland; - - postInstall = '' - # Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration - install -D ${./99-ds3-controllers.rules} $out/etc/udev/rules.d/99-ds3-controllers.rules - install -D ${./99-ds4-controllers.rules} $out/etc/udev/rules.d/99-ds4-controllers.rules - install -D ${./99-dualsense-controllers.rules} $out/etc/udev/rules.d/99-dualsense-controllers.rules - ''; - - meta = with lib; { - description = "PS3 emulator/debugger"; - homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; - license = licenses.gpl2Only; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "rpcs3"; - }; -} diff --git a/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh b/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh deleted file mode 100755 index 1efecc7ec88c..000000000000 --- a/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix gnused jq nix-prefetch-git curl cacert - -set -eou pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename $ROOT)" == "rpcs3" || ! -f "$ROOT/default.nix" ]]; then - echo "ERROR: Not in the rpcs3 folder" - exit 1 -fi - -if [[ ! -v GITHUB_TOKEN ]]; then - echo "ERROR: \$GITHUB_TOKEN not set" - exit 1 -fi - -payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' <<EOF | curl -s -H "Authorization: bearer $GITHUB_TOKEN" -d '@-' https://api.github.com/graphql -{ - repository(owner: "RPCS3", name: "rpcs3") { - branch: ref(qualifiedName: "refs/heads/master") { - target { - oid - ... on Commit { - history { - totalCount - } - } - } - } - - tag: refs(refPrefix: "refs/tags/", first: 1, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { - nodes { - name - } - } - } -} -EOF -) - -commit_sha=$(jq -r .data.repository.branch.target.oid <<< "$payload") -major_ver=$(jq -r .data.repository.tag.nodes[0].name <<< "$payload" | sed 's/^v//g') -commit_count=$(jq -r .data.repository.branch.target.history.totalCount <<< "$payload") -git_ver="$commit_count-${commit_sha::9}" -final_ver="$major_ver-$git_ver" - - -echo "INFO: Latest commit is $commit_sha" -echo "INFO: Latest version is $final_ver" - -nix_hash=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256) -nix_hash=$(nix hash to-sri --type sha256 "$nix_hash") -echo "INFO: Hash is $nix_hash" - -sed -i -E \ - -e "s/rpcs3GitVersion\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3GitVersion = \"${git_ver}\";/g" \ - -e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \ - -e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \ - -e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \ - "$ROOT/default.nix" diff --git a/nixpkgs/pkgs/applications/emulators/xemu/default.nix b/nixpkgs/pkgs/applications/emulators/xemu/default.nix index 25f0511c476c..e0e022ebb402 100644 --- a/nixpkgs/pkgs/applications/emulators/xemu/default.nix +++ b/nixpkgs/pkgs/applications/emulators/xemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.116"; + version = "0.7.117"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-/fUTQYi6EDG4wUFc17nuBUt/F1zBdhk/MEizwTo5I8Q="; + hash = "sha256-R6BPDBMrVhxUkjMWK8Jz9vqEz5P3v62PIyulHp6Q+KM="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/file-managers/clex/default.nix b/nixpkgs/pkgs/applications/file-managers/clex/default.nix index a2ac0df9801d..507da73bbc53 100644 --- a/nixpkgs/pkgs/applications/file-managers/clex/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/clex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clex"; - version = "4.6.patch10"; + version = "4.7"; src = fetchurl { - sha256 = "03niihqk57px7rm2c84qira5jm5vw8lj5s58dximk0w5gsis4fhw"; - url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; + url = "https://github.com/xitop/clex/releases/download/v${version}/clex-${version}.tar.gz"; + hash = "sha256-3Y3ayJEy9pHLTUSeXYeekTVdopwKLZ8vVcVarLIFnpM="; }; buildInputs = [ ncurses ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { to be executed by the shell. There are no built-in commands, CLEX is an add-on to your favorite shell. ''; - homepage = "http://www.clex.sk"; + homepage = "https://github.com/xitop/clex"; license = licenses.gpl2Plus; platforms = with platforms; linux ++ darwin; }; diff --git a/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix index 04491de0fd9f..b6166f2586d4 100644 --- a/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; rev = "v${version}"; - hash = "sha256-pDJW/QhkJtEAq7xusYn/t/pPizT77OYmlbVlF/RTXic="; + hash = "sha256-vDQHOv6ejp2aOQY0s80mC7x5sG6wB1/98/taw7aYEnE="; }; - cargoHash = "sha256-AGQt06fMXuyOEmQIEiUCzuK1Atx3gQMUCB+hPWlrldk="; + cargoHash = "sha256-xy/h2O7aTURt4t8sNRASLhMYtceQrZnOynwhfhaecDA="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix b/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix index 937991ede40b..f2bb67292306 100644 --- a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix @@ -1,22 +1,37 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "kamiyaa"; repo = "joshuto"; rev = "v${version}"; - hash = "sha256-b13CLfWidqfYhHC9wY84kd3elsjWGxBMGr5GXHzUhfs="; + hash = "sha256-d2r8xPGnH/299wjEijilgqy3u/xJgtRmwzJdHt0sA+o="; }; - cargoHash = "sha256-gMX8hvt20V4XUd0nnXGA4fyOUfB7ZY1eeme9HgYopL0="; + cargoHash = "sha256-amgqoL7NYfl3WzTtgvDoBX46rsL9248rbCis6MHVQhE="; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + postInstall = '' + installShellCompletion --cmd joshuto \ + --bash <($out/bin/joshuto completions bash) \ + --zsh <($out/bin/joshuto completions zsh) \ + --fish <($out/bin/joshuto completions fish) + ''; + meta = with lib; { description = "Ranger-like terminal file manager written in Rust"; homepage = "https://github.com/kamiyaa/joshuto"; diff --git a/nixpkgs/pkgs/applications/file-managers/krusader/compat-fix.patch b/nixpkgs/pkgs/applications/file-managers/krusader/compat-fix.patch new file mode 100644 index 000000000000..5411982b97ba --- /dev/null +++ b/nixpkgs/pkgs/applications/file-managers/krusader/compat-fix.patch @@ -0,0 +1,20 @@ +diff --git a/app/compat.h b/app/compat.h +index b63d561..c051f35 100644 +--- a/app/compat.h ++++ b/app/compat.h +@@ -11,13 +11,13 @@ + + #if __has_include(<KCompletion/kcompletion_version.h>) + # include <KCompletion/kcompletion_version.h> +-#else // Pre KF-5.91 header layout ++#elif __has_include(<kcompletion_version.h>) // Pre KF-5.91 header layout + # include <kcompletion_version.h> + #endif + + #if __has_include(<KArchive/karchive_version.h>) + # include <KArchive/karchive_version.h> +-#else // Pre KF-5.91 header layout ++#elif __has_include(<karchive_version.h>) // Pre KF-5.91 header layout + # include <karchive_version.h> + #endif + diff --git a/nixpkgs/pkgs/applications/file-managers/krusader/default.nix b/nixpkgs/pkgs/applications/file-managers/krusader/default.nix index b2639fe84984..ec7e47f896c6 100644 --- a/nixpkgs/pkgs/applications/file-managers/krusader/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/krusader/default.nix @@ -15,13 +15,18 @@ mkDerivation rec { pname = "krusader"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-QaOaQ7PELdHR7K6obfMMr/agYf7MHWb2CFmyo8qXYQk="; + hash = "sha256-jkzwWpMYsLwbCUGBG5iLLyuwwEoNHjeZghKpGQzywpo="; }; + patches = [ + # Fix compilation error due to forceful header include + ./compat-fix.patch + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools diff --git a/nixpkgs/pkgs/applications/file-managers/nimmm/default.nix b/nixpkgs/pkgs/applications/file-managers/nimmm/default.nix deleted file mode 100644 index 0e0d75ab8012..000000000000 --- a/nixpkgs/pkgs/applications/file-managers/nimmm/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, nimPackages, fetchFromGitHub, nim, termbox, pcre }: - -nimPackages.buildNimPackage rec { - pname = "nimmm"; - version = "0.2.0"; - nimBinOnly = true; - - src = fetchFromGitHub { - owner = "joachimschmidt557"; - repo = "nimmm"; - rev = "v${version}"; - sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg"; - }; - - buildInputs = [ termbox pcre ] - ++ (with nimPackages; [ noise nimbox lscolors ]); - - meta = with lib; { - description = "Terminal file manager written in nim"; - homepage = "https://github.com/joachimschmidt557/nimmm"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = [ maintainers.joachimschmidt557 ]; - }; -} diff --git a/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/nixpkgs/pkgs/applications/file-managers/nnn/default.nix index af4064abbec1..4e08dc0543e9 100644 --- a/nixpkgs/pkgs/applications/file-managers/nnn/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/nnn/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "nnn"; }; }) diff --git a/nixpkgs/pkgs/applications/file-managers/noice/default.nix b/nixpkgs/pkgs/applications/file-managers/noice/default.nix index e67346c51715..25e93ace7c04 100644 --- a/nixpkgs/pkgs/applications/file-managers/noice/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/noice/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://git.2f30.org/noice/"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ iogamaster ]; }; } diff --git a/nixpkgs/pkgs/applications/finance/irpf/default.nix b/nixpkgs/pkgs/applications/finance/irpf/default.nix index 9cf86f825629..2d280a41c5df 100644 --- a/nixpkgs/pkgs/applications/finance/irpf/default.nix +++ b/nixpkgs/pkgs/applications/finance/irpf/default.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { pname = "irpf"; - version = "2023-1.3"; + version = "2023-1.5"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -19,13 +19,13 @@ 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"; - sha256 = "sha256-W9n9YlOg9BYsESuU5NOn+Ff+I+7vlBpFuKzHsGVJwAA="; + hash = "sha256-L1X+xysQSJ43TO8NSdO+T4aalampd4REL+5Uv33kYUI="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; desktopItems = [ - (makeDesktopItem rec { + (makeDesktopItem { name = pname; exec = pname; icon = "rfb64"; @@ -41,10 +41,9 @@ stdenvNoCC.mkDerivation rec { BASEDIR="$out/share/${pname}" mkdir -p "$BASEDIR" - cp -r help lib lib-modulos "$BASEDIR" + cp --no-preserve=mode -r help lib lib-modulos "$BASEDIR" - install -Dm755 irpf.jar "$BASEDIR/${pname}.jar" - install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" + install -Dm644 irpf.jar Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" # make xdg-open overrideable at runtime makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ diff --git a/nixpkgs/pkgs/applications/gis/grass/default.nix b/nixpkgs/pkgs/applications/gis/grass/default.nix index cd0d6dbc9386..9294c33c5863 100644 --- a/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -152,5 +152,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ]; platforms = platforms.all; + mainProgram = "grass"; }; }) diff --git a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix index 9722c3cb4dee..81278c9184e7 100644 --- a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -87,5 +87,6 @@ mkDerivation rec { maintainers = with maintainers; [ mpickering sikmir ]; platforms = with platforms; unix; broken = stdenv.isDarwin; + mainProgram = "Mapper"; }; } diff --git a/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index f6cc1bbc408a..ba587bb76365 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -76,14 +76,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.28.12"; + version = "3.28.13"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-C80ZrQW7WFXz8UMXSt3FJcK2gDd292H24Ic3pJD/yqI="; + hash = "sha256-5UHyRxWFqhTq97VNb8AU8QYGaY0lmGB8bo8yXp1vnFQ="; }; passthru = { diff --git a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 3faf4d304a5f..8bc888bca918 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -77,14 +77,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.0"; + version = "3.34.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-+Yzp8kfd7cfxTwsrxRo+6uS+2Aj4HfKA2E8hSf7htsU="; + hash = "sha256-y+MATjhGUh0Qu4mNRALmP04Zd2/ozvaJnJDdM38Cy+w="; }; passthru = { diff --git a/nixpkgs/pkgs/applications/gis/tunnelx/default.nix b/nixpkgs/pkgs/applications/gis/tunnelx/default.nix index 3ec0439a5d88..270faac53f68 100644 --- a/nixpkgs/pkgs/applications/gis/tunnelx/default.nix +++ b/nixpkgs/pkgs/applications/gis/tunnelx/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ goatchurchprime ]; platforms = lib.platforms.linux; + mainProgram = "tunnelx"; }; }) diff --git a/nixpkgs/pkgs/applications/gis/udig/default.nix b/nixpkgs/pkgs/applications/gis/udig/default.nix index 808b70ed5ec9..8510918d4cab 100644 --- a/nixpkgs/pkgs/applications/gis/udig/default.nix +++ b/nixpkgs/pkgs/applications/gis/udig/default.nix @@ -22,6 +22,7 @@ let license = with licenses; [ epl10 bsd3 ]; maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; + mainProgram = "udig"; }; linux = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/applications/graphics/akira/default.nix b/nixpkgs/pkgs/applications/graphics/akira/default.nix index efa153df155d..3903a3acd8ea 100644 --- a/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -9,7 +9,6 @@ , pkg-config , python3 , vala -, vala-lint , wrapGAppsHook , cairo , glib @@ -41,7 +40,6 @@ stdenv.mkDerivation rec { pkg-config python3 vala - vala-lint wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/nixpkgs/pkgs/applications/graphics/drawio/default.nix index fdf571b026a3..688b61a86d0c 100644 --- a/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeDesktopItem , copyDesktopItems -, fixup_yarn_lock +, prefetch-yarn-deps , makeWrapper , nodejs , yarn @@ -13,23 +13,23 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "22.0.3"; + version = "22.1.2"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Im0T+1jm1IZT3UILsOJ4Rp5P5IiBUKcJJ+cqv3WsqXw="; + hash = "sha256-4S4N7vfDwzlNutPfHozy/z0LOAr8q8EepXV4tsy+yAU="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-Abyu/WoNOPAIfRIThG7vKFECW9NQMgcBAkLgEPwdJDQ="; + hash = "sha256-QM7qazr8Iv4gjO7vF5Wj564D/yB+ZWmMGQDtTFytK00="; }; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps makeWrapper nodejs yarn @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { export HOME="$TMPDIR" yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix b/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix index 2cfd3d7adfa2..f531f8c16271 100644 --- a/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix +++ b/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix @@ -6,6 +6,7 @@ , pkg-config , meson , ninja +, blueprint-compiler , glib , gtk4 , libadwaita @@ -17,25 +18,26 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = "v${version}"; - hash = "sha256-ZlqRTTSQHmsOhQNg8W2hKL2/zCOu2ECEUrTQ507WN90="; + hash = "sha256-PStQC9n+DTTOiNO9fHUjIkwgvKeA2alVbtX5qfqhTYo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/CIheSIFrymYcCip3NmozAS8ojPnF0qO+oXI15zttkE="; + hash = "sha256-WRjoyIoVvOYcw2i/cMycE67iziZ8dvQrZ3EfE2v2jkQ="; }; nativeBuildInputs = [ meson ninja pkg-config + blueprint-compiler wrapGAppsHook4 appstream-glib desktop-file-utils diff --git a/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix b/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix index 0aa5d6b55350..e76426ab103f 100644 --- a/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix +++ b/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb"; - hash = "sha256-T5SFcdz5yrInE6+ydJqtstEYF0MvHquRZ7nvlCOVNzE="; + hash = "sha256-WKL5RabTUD8xIOUoISyn26NXYrNImKZdjXnTYkXpfkE="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 8145d05b9a71..653dad23b638 100644 --- a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://www.geeqie.org/"; - maintainers = with maintainers; [ jfrankenau pSub markus1189 ]; + maintainers = with maintainers; [ pSub markus1189 ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index 78f25a0df3ad..0acc934a7fd9 100644 --- a/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchurl, perlPackages, wrapGAppsHook, +{ lib, fetchurl, perlPackages, wrapGAppsHook, fetchpatch, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies - imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, + imagemagick, libtiff_4_5, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, # test dependencies xvfb-run, liberation_ttf, file, tesseract }: @@ -17,6 +17,17 @@ perlPackages.buildPerlPackage rec { hash = "sha256-NGz6DUa7TdChpgwmD9pcGdvYr3R+Ft3jPPSJpybCW4Q="; }; + patches = [ + # fixes warnings during tests. See https://sourceforge.net/p/gscan2pdf/bugs/421 + (fetchpatch { + name = "0001-Remove-given-and-when-keywords-and-operator.patch"; + url = "https://sourceforge.net/p/gscan2pdf/bugs/_discuss/thread/602a7cedfd/1ea4/attachment/0001-Remove-given-and-when-keywords-and-operator.patch"; + hash = "sha256-JtrHUkfEKnDhWfEVdIdYVlr5b/xChTzsrrPmruLaJ5M="; + }) + # fixes an error with utf8 file names. See https://sourceforge.net/p/gscan2pdf/bugs/400 + ./image-utf8-fix.patch + ]; + nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = @@ -71,7 +82,7 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/gscan2pdf" \ --prefix PATH : "${sane-backends}/bin" \ --prefix PATH : "${imagemagick}/bin" \ - --prefix PATH : "${libtiff}/bin" \ + --prefix PATH : "${libtiff_4_5}/bin" \ --prefix PATH : "${djvulibre}/bin" \ --prefix PATH : "${poppler_utils}/bin" \ --prefix PATH : "${ghostscript}/bin" \ @@ -87,7 +98,10 @@ perlPackages.buildPerlPackage rec { nativeCheckInputs = [ imagemagick - libtiff + # 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 djvulibre poppler_utils ghostscript @@ -130,12 +144,6 @@ perlPackages.buildPerlPackage rec { # Non-zero wait status: 139 rm t/0601_Dialog_Scan.t - # Disable a test which failed due to convert returning an exit value of 1 - # convert: negative or zero image size `/build/KL5kTVnNCi/YfgegFM53e.pnm' @ error/resize.c/ResizeImage/3743. - # *** unhandled exception in callback: - # *** "convert" unexpectedly returned exit value 1 at t/357_unpaper_rtl.t line 63. - rm t/357_unpaper_rtl.t - xvfb-run -s '-screen 0 800x600x24' \ make test ''; diff --git a/nixpkgs/pkgs/applications/graphics/gscan2pdf/image-utf8-fix.patch b/nixpkgs/pkgs/applications/graphics/gscan2pdf/image-utf8-fix.patch new file mode 100644 index 000000000000..fa1d03e0309a --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/gscan2pdf/image-utf8-fix.patch @@ -0,0 +1,32 @@ +diff --git a/bin/gscan2pdf b/bin/gscan2pdf +index e075b0f2..ff124522 100755 +--- a/bin/gscan2pdf ++++ b/bin/gscan2pdf +@@ -3434,9 +3434,11 @@ sub save_image { + if ( @{$list_of_pages} > 1 ) { + my $w = length scalar @{$list_of_pages}; + for ( 1 .. @{$list_of_pages} ) { ++ _utf8_on($filename); + my $current_filename = + sprintf "${filename}_%0${w}d.$SETTING{'image type'}", + $_; ++ _utf8_off($filename); + if ( -f $current_filename ) { + my $text = sprintf __('This operation would overwrite %s'), + $current_filename; +@@ -3450,11 +3452,15 @@ sub save_image { + return; + } + } ++ _utf8_on($filename); + $filename = "${filename}_%0${w}d.$SETTING{'image type'}"; ++ _utf8_off($filename); + } + else { + if ( $filename !~ /[.]$SETTING{'image type'}$/ixsm ) { ++ _utf8_on($filename); + $filename = "$filename.$SETTING{'image type'}"; ++ _utf8_off($filename); + return if ( file_exists( $file_chooser, $filename ) ); + } + return if ( file_writable( $file_chooser, $filename ) ); diff --git a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 8bddaa96abd5..544b67fe26c2 100644 --- a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "552"; + version = "554"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-MaS9WxYlbQ7V/2mrETKS0UyWb5IzCrSwDcp4UlVS3zk="; + hash = "sha256-BNAEM9XFkdKLQUAWerM6IWts04FWdd8SSCJZaymmxGo="; }; nativeBuildInputs = [ @@ -106,7 +106,7 @@ python3Packages.buildPythonPackage rec { installPhase = '' # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} - mv {hydrus,static} $out/${python3Packages.python.sitePackages} + mv {hydrus,static,db} $out/${python3Packages.python.sitePackages} # Fix random files being marked with execute permissions chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico} # Build docs diff --git a/nixpkgs/pkgs/applications/graphics/icon-library/default.nix b/nixpkgs/pkgs/applications/graphics/icon-library/default.nix index cbf91c83cf77..cbd704a24a91 100644 --- a/nixpkgs/pkgs/applications/graphics/icon-library/default.nix +++ b/nixpkgs/pkgs/applications/graphics/icon-library/default.nix @@ -1,22 +1,46 @@ -{ lib, stdenv, fetchurl, fetchpatch, wrapGAppsHook4 -, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc -, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita, darwin +{ lib +, stdenv +, fetchurl +, fetchpatch +, wrapGAppsHook4 +, cargo +, desktop-file-utils +, meson +, ninja +, pkg-config +, rustc +, gdk-pixbuf +, glib +, gtk4 +, gtksourceview5 +, libadwaita +, darwin }: stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.16"; + version = "0.0.17"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/5dd3d97acfdbaf69c7dc6b2f7bbf4cae/icon-library-${version}.tar.xz"; - hash = "sha256-EO67foD/uRoeF+zmJyEia5Nr3eW+Se9bVjDxipMw75E="; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/8c4cad88809cd4ddc0eeae6f5170c001/icon-library-${version}.tar.xz"; + hash = "sha256-Gspx3fJl+ZoUN3heGWaeMuxUsjWCrIdg4pJj7DeMTSY="; }; nativeBuildInputs = [ - cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook4 + cargo + desktop-file-utils + meson + ninja + pkg-config + rustc + wrapGAppsHook4 ]; buildInputs = [ - gdk-pixbuf glib gtk4 gtksourceview5 libadwaita + gdk-pixbuf + glib + gtk4 + gtksourceview5 + libadwaita ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 85b067d9fb29..6350cec90e95 100644 --- a/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.3"; + version = "1.3.1"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${version}/source/archive/xz/dl/inkscape-${version}.tar.xz"; - sha256 = "sha256-v08oawJeAWm4lIzBTVGZqbTCBNdhyJTEtISWVx7HYwc="; + sha256 = "sha256-Qh4ANf5bOwVKCGXcgjW+P55uLepUGQ2Sa4gKTOBbANg="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix b/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix index d411091bbd40..48eb1f1f94b7 100644 --- a/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix +++ b/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix @@ -3,6 +3,7 @@ , runCommand , inkcut , callPackage +, texlive }: { @@ -43,4 +44,8 @@ mkdir -p $out/share/inkscape/extensions cp ${inkcut}/share/inkscape/extensions/* $out/share/inkscape/extensions ''); + textext = callPackage ./extensions/textext { + pdflatex = texlive.combined.scheme-basic; + lualatex = texlive.combined.scheme-basic; + }; } diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/default.nix new file mode 100644 index 000000000000..c049458808a5 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -0,0 +1,125 @@ +{ lib +, writeScript +, fetchFromGitHub +, substituteAll +, inkscape +, pdflatex +, lualatex +, python3 +, wrapGAppsHook +, gobject-introspection +, gtk3 +, gtksourceview3 +}: + +let + launchScript = writeScript "launch.sh" '' + cd $(dirname $0) + ./__main__.py $* + ''; +in +python3.pkgs.buildPythonApplication rec { + pname = "textext"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "textext"; + repo = "textext"; + rev = version; + sha256 = "sha256-Qzd39X0X3DdwZ3pIIGvEbNjl6dxjDf3idzjwCkp3WRg="; + }; + + patches = [ + # Make sure we can point directly to pdflatex in the extension, + # instead of relying on the PATH (which might not have it) + (substituteAll { + src = ./fix-paths.patch; + inherit pdflatex lualatex; + }) + + # Since we are wrapping the extension, we need to change the interpreter + # from Python to Bash. + ./interpreter.patch + ]; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + + buildInputs = [ + gtk3 + gtksourceview3 + ]; + + propagatedBuildInputs = [ + python3.pkgs.pygobject3 + # lxml, cssselect and numpy are required by inkex but is not inherited from inkscape when we use custom Python interpreter: + python3.pkgs.lxml + python3.pkgs.cssselect + python3.pkgs.numpy + ]; + + # strictDeps do not play nicely with introspection setup hooks. + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + # TexText doesn’t have a 'bdist_wheel' target. + dontUseSetuptoolsBuild = true; + + # TexText doesn’t have a 'test' target. + doCheck = false; + + # Avoid wrapping two times by just using Python’s wrapping. + dontWrapGApps = true; + + buildPhase = '' + runHook preBuild + + mkdir dist + + # source/setup.py creates a config file in HOME (that we ignore) + mkdir buildhome + export HOME=$(pwd)/buildhome + + python setup.py \ + --inkscape-executable=${inkscape}/bin/inkscape \ + --pdflatex-executable=${pdflatex}/bin/pdflatex \ + --lualatex-executable=${lualatex}/bin/lualatex \ + --inkscape-extensions-path=dist + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/inkscape/extensions + cp -r dist/textext $out/share/inkscape/extensions + + runHook postInstall + ''; + + preFixup = '' + # Prepare for wrapping + chmod +x "$out/share/inkscape/extensions/textext/__main__.py" + sed -i '1i#!/usr/bin/env python3' "$out/share/inkscape/extensions/textext/__main__.py" + + # Include gobject-introspection typelibs in the wrapper. + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + # Wrap the project so it can find runtime dependencies. + wrapPythonProgramsIn "$out/share/inkscape/extensions/textext" "$out $pythonPath" + cp ${launchScript} $out/share/inkscape/extensions/textext/launch.sh + ''; + + meta = with lib; { + description = "Re-editable LaTeX graphics for Inkscape"; + homepage = "https://textext.github.io/textext/"; + license = licenses.bsd3; + maintainers = [ maintainers.raboof ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/fix-paths.patch b/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/fix-paths.patch new file mode 100644 index 000000000000..8c9d9a22e1b8 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/fix-paths.patch @@ -0,0 +1,19 @@ +--- a/textext/base.py ++++ b/textext/base.py +@@ -95,7 +95,16 @@ class TexText(inkex.EffectExtension): + def __init__(self): + + self.config = Settings(directory=defaults.textext_config_path) ++ # config.json is stored in ~/.config/inkscape/extensions/textext for ++ # the next invocation, but since that next invocation could be using ++ # a different latex derivation, make sure we overwrite the executable ++ # paths with updated ones: ++ self.config["pdflatex-executable"] = "@pdflatex@/bin/pdflatex"; ++ self.config["lualatex-executable"] = "@lualatex@/bin/lualatex"; + self.cache = Cache(directory=defaults.textext_config_path) ++ if "requirements_checker" in self.cache.values: ++ self.cache["requirements_checker"]["available_tex_to_pdf_converters"]["pdflatex"] = "@pdflatex@/bin/pdflatex"; ++ self.cache["requirements_checker"]["available_tex_to_pdf_converters"]["lualatex"] = "@lualatex@/bin/lualatex"; + previous_exit_code = self.cache.get("previous_exit_code", None) + + if previous_exit_code is None: diff --git a/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/interpreter.patch b/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/interpreter.patch new file mode 100644 index 000000000000..c7e9f7ce0394 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/interpreter.patch @@ -0,0 +1,10 @@ +--- a/textext/textext.inx ++++ b/textext/textext.inx +@@ -8,6 +8,6 @@ + </effects-menu> + </effect> + <script> +- <command location="inx" interpreter="python">__main__.py</command> ++ <command location="inx" interpreter="shell">launch.sh</command> + </script> + </inkscape-extension> diff --git a/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/nixpkgs/pkgs/applications/graphics/komikku/default.nix index 8f317bd513ff..fc2437c1c4c5 100644 --- a/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -1,10 +1,10 @@ { lib , fetchFromGitLab -, fetchpatch , desktop-file-utils , gettext , glib , gobject-introspection +, blueprint-compiler , gtk4 , libadwaita , libnotify @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.24.2"; + version = "1.29.0"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-c00JRy1K/jYoQYNAMSm6lQkuGQXZv/2liV1F4jpg+C4="; + hash = "sha256-efKYmsDbdDxgOHkv05zwlq88NzW7pYOQOYcJqPeKXkY="; }; nativeBuildInputs = [ @@ -39,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { glib # for glib-compile-resources desktop-file-utils gobject-introspection + blueprint-compiler ]; buildInputs = [ @@ -50,20 +51,21 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - pygobject3 beautifulsoup4 brotli - cloudscraper + colorthief dateparser emoji keyring lxml - python-magic natsort piexif pillow pure-protobuf + pygobject3 + python-magic rarfile + requests unidecode ]; diff --git a/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/nixpkgs/pkgs/applications/graphics/paraview/default.nix index 14c86082e671..48b98b36d5c4 100644 --- a/nixpkgs/pkgs/applications/graphics/paraview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/paraview/default.nix @@ -86,6 +86,10 @@ in stdenv.mkDerivation rec { qtsvg ]; + patches = [ + ./dont-redefine-strlcat.patch + ]; + postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in lib.optionalString withDocs '' mkdir -p ${docDir}; diff --git a/nixpkgs/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch b/nixpkgs/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch new file mode 100644 index 000000000000..d7e24e7d7305 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch @@ -0,0 +1,28 @@ +--- a/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2023-11-27 21:11:33.562949964 +0100 ++++ b/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2023-11-27 21:11:33.562949964 +0100 +@@ -1246,7 +1246,7 @@ + #define write_numrecs vtknetcdf_write_numrecs + + /* Only define strlcat conditionally, as it's provided by system headers on the BSDs. */ +-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(_BSD_SOURCE) ++#ifndef HAVE_STRLCAT + #define strlcat vtknetcdf_strlcat + #endif + +--- a/VTK/ThirdParty/netcdf/vtknetcdf/config.h.in 2023-11-27 21:10:35.113525241 +0100 ++++ b/VTK/ThirdParty/netcdf/vtknetcdf/config.h.in 2023-11-27 21:10:55.241982399 +0100 +@@ -1,7 +1,5 @@ + /* config.h.in. Generated from configure.ac by autoheader. */ + +-#include "vtk_netcdf_mangle.h" +- + /* Define if building universal (internal helper macro) */ + #cmakedefine AC_APPLE_UNIVERSAL_BUILD + +@@ -621,4 +619,6 @@ + #endif + #endif + ++#include "vtk_netcdf_mangle.h" ++ + #include "ncconfigure.h" diff --git a/nixpkgs/pkgs/applications/graphics/processing/default.nix b/nixpkgs/pkgs/applications/graphics/processing/default.nix index b8d2adc909f2..54d6723f7427 100644 --- a/nixpkgs/pkgs/applications/graphics/processing/default.nix +++ b/nixpkgs/pkgs/applications/graphics/processing/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }: let - buildNumber = "1292"; + buildNumber = "1293"; vaqua = fetchurl { name = "VAqua9.jar"; url = "https://violetlib.org/release/vaqua/9/VAqua9.jar"; @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "processing"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "processing"; repo = "processing4"; rev = "processing-${buildNumber}-${version}"; - sha256 = "sha256-wdluhrtliLN4T2dcmwvUWZhOARC3Lst7+hWWwZjafmU="; + sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0="; }; nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { buildPhase = '' echo "tarring jdk" - tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-${arch}.tgz ${jdk} + tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk} cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/ mkdir -p core/library ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/ @@ -82,6 +82,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/ + mkdir -p $out/share/applications/ + cp -dp build/linux/${pname}.desktop $out/share/applications/ cp -dpr build/linux/work $out/share/${pname} rmdir $out/share/${pname}/java ln -s ${jdk} $out/share/${pname}/java diff --git a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 490a89b30b86..e6d0319950d5 100644 --- a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -100,6 +100,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { homepage = "https://www.damonlynch.net/rapid/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock b/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock index c678290754e9..96130db9b310 100644 --- a/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock +++ b/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock @@ -18,15 +18,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "alsa" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -65,9 +83,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -79,15 +97,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -103,9 +121,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -161,21 +179,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] +name = "async-channel" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.1.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] name = "async-executor" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", + "fastrand 2.0.1", + "futures-lite 1.13.0", "slab", ] @@ -185,10 +216,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -197,64 +228,111 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.23", + "polling 2.8.0", + "rustix 0.37.27", "slab", "socket2", "waker-fn", ] [[package]] +name = "async-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +dependencies = [ + "async-lock 3.1.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.0", + "rustix 0.38.24", + "slab", + "tracing", + "waker-fn", + "windows-sys 0.48.0", +] + +[[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +dependencies = [ + "event-listener 3.1.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-net" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" dependencies = [ - "async-io", - "autocfg", + "async-io 1.13.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.23", - "signal-hook", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.24", + "windows-sys 0.48.0", +] + +[[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.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.24", + "signal-hook-registry", + "slab", "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "atomic-polyfill" @@ -267,9 +345,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -320,7 +398,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.39", "which", ] @@ -333,7 +411,7 @@ dependencies = [ "autocxx-engine", "env_logger 0.9.3", "indexmap 1.9.3", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -360,7 +438,7 @@ dependencies = [ "rustversion", "serde_json", "strum_macros", - "syn 2.0.29", + "syn 2.0.39", "tempfile", "thiserror", "version_check", @@ -376,7 +454,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -393,7 +471,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.29", + "syn 2.0.39", "thiserror", ] @@ -423,17 +501,17 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bindgen" -version = "0.64.0" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -444,7 +522,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -461,9 +539,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block" @@ -473,50 +551,51 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "blocking" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.1.0", + "async-lock 3.1.0", "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.0.1", + "piper", + "tracing", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[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 = "cairo-rs" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" +checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cairo-sys-rs", "glib", "libc", @@ -526,9 +605,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -568,9 +647,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -584,17 +663,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -610,20 +688,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.0" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.0" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -633,21 +710,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[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 = "cmake" @@ -692,9 +769,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -714,32 +791,26 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "coreaudio-rs" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.6.2", + "core-foundation-sys", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" +checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028" dependencies = [ "bindgen", ] @@ -751,7 +822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "coreaudio-rs", "dasp_sample", "jni 0.19.0", @@ -766,7 +837,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows", ] [[package]] @@ -785,16 +856,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[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" @@ -853,14 +914,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "cxx" -version = "1.0.106" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" dependencies = [ "cc", "cxxbridge-flags", @@ -870,31 +931,31 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.106" +version = "0.7.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665584721578167d2658c879999867a3874d90494f5aa6325518540a8ee7b67c" +checksum = "a3e0fc77e9f8d61724be90deb42a7e50ba3bf37c7c16dc91cdba821f69a5e0e9" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "cxxbridge-flags" -version = "1.0.106" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" [[package]] name = "cxxbridge-macro" -version = "1.0.106" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -1037,11 +1098,11 @@ dependencies = [ [[package]] name = "earcutr" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +checksum = "79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01" dependencies = [ - "itertools 0.10.5", + "itertools 0.11.0", "num-traits", ] @@ -1081,9 +1142,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1100,26 +1161,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" 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 = "euclid" version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1135,10 +1185,31 @@ 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-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + +[[package]] name = "exr" -version = "1.7.0" +version = "1.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" dependencies = [ "bit_field", "flume", @@ -1167,15 +1238,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -1192,9 +1263,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1217,14 +1288,10 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin", ] @@ -1254,7 +1321,7 @@ dependencies = [ "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.19.1", + "ttf-parser 0.19.2", ] [[package]] @@ -1284,9 +1351,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1299,9 +1366,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1309,15 +1376,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1326,9 +1393,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1346,33 +1413,43 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1397,9 +1474,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" +checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1423,9 +1500,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1465,15 +1542,15 @@ dependencies = [ "geographiclib-rs", "log", "num-traits", - "robust 1.1.0", + "robust", "rstar", ] [[package]] name = "geo-types" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" dependencies = [ "approx", "num-traits", @@ -1492,15 +1569,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", - "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", + "wasi", ] [[package]] @@ -1541,9 +1616,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" +checksum = "47d809baf02bdf1b5ef4ad3bf60dd9d4977149db4612b7bbb58e56aef168193b" dependencies = [ "futures-channel", "futures-core", @@ -1573,11 +1648,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" +checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -1596,16 +1671,16 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -1660,9 +1735,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" dependencies = [ "cairo-rs", "gdk4", @@ -1675,9 +1750,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1691,9 +1766,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ "cairo-rs", "field-offset", @@ -1717,7 +1792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1726,9 +1801,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1769,9 +1844,13 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "heapless" @@ -1803,9 +1882,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[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 = "humantime" @@ -1815,16 +1903,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -1902,19 +1990,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -1958,7 +2046,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -1978,8 +2066,8 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.9", + "hermit-abi 0.3.3", + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -2068,9 +2156,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2086,9 +2174,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2128,9 +2216,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ "gdk-pixbuf", "gdk4", @@ -2144,9 +2232,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ "gdk4-sys", "gio-sys", @@ -2160,9 +2248,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -2176,14 +2264,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "librsvg" -version = "2.57.0-beta.2" -source = "git+https://gitlab.gnome.org/GNOME/librsvg?rev=58c52b742d7623b9a4e94975fb65cbf4a9ff13f1#58c52b742d7623b9a4e94975fb65cbf4a9ff13f1" +version = "2.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4b6285fca2e4de40d61e398408a4cd261d475a960da58ae28d94d6352088078" dependencies = [ "cairo-rs", "cast", @@ -2233,9 +2322,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "locale_config" @@ -2252,9 +2341,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2312,9 +2401,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", @@ -2322,9 +2411,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -2373,7 +2462,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -2430,15 +2519,6 @@ dependencies = [ ] [[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] name = "ndk" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2485,6 +2565,12 @@ dependencies = [ ] [[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2517,13 +2603,13 @@ dependencies = [ [[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", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -2549,9 +2635,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -2563,7 +2649,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", ] @@ -2582,7 +2668,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -2595,6 +2681,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] +name = "numeric-sort" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f2c4adf593c928171160e2632096353bb0306d3c8447143861374d5e678e37" +dependencies = [ + "no-std-compat", +] + +[[package]] name = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2625,9 +2720,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -2673,12 +2768,6 @@ dependencies = [ ] [[package]] -name = "optional" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc" - -[[package]] name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2704,14 +2793,14 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "pango" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ "gio", "glib", @@ -2760,9 +2849,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -2776,9 +2865,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", @@ -2898,7 +2987,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -2948,26 +3037,6 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2980,6 +3049,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3025,6 +3105,20 @@ dependencies = [ ] [[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.24", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] name = "poppler-rs" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3053,9 +3147,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "ppv-lite86" @@ -3075,18 +3169,18 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" dependencies = [ - "env_logger 0.10.0", + "env_logger 0.10.1", "log", ] [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -3096,7 +3190,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -3125,9 +3228,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3213,9 +3316,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[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", @@ -3223,14 +3326,12 @@ 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]] @@ -3241,18 +3342,18 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -3262,9 +3363,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -3273,22 +3374,22 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] [[package]] name = "rnote" -version = "0.8.2" +version = "0.9.2" dependencies = [ "anyhow", "base64", @@ -3304,9 +3405,11 @@ dependencies = [ "libadwaita", "log", "nalgebra", - "num-derive 0.4.0", + "num-derive 0.4.1", "num-traits", + "numeric-sort", "once_cell", + "open", "parry2d-f64", "piet", "piet-cairo", @@ -3333,7 +3436,7 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.8.2" +version = "0.9.2" dependencies = [ "anyhow", "atty", @@ -3351,7 +3454,7 @@ dependencies = [ [[package]] name = "rnote-compose" -version = "0.8.2" +version = "0.9.2" dependencies = [ "anyhow", "base64", @@ -3360,7 +3463,7 @@ dependencies = [ "kurbo", "log", "nalgebra", - "num-derive 0.4.0", + "num-derive 0.4.1", "num-traits", "once_cell", "palette", @@ -3379,7 +3482,7 @@ dependencies = [ [[package]] name = "rnote-engine" -version = "0.8.2" +version = "0.9.2" dependencies = [ "anyhow", "approx", @@ -3400,7 +3503,7 @@ dependencies = [ "librsvg", "log", "nalgebra", - "num-derive 0.4.0", + "num-derive 0.4.1", "num-traits", "once_cell", "parry2d-f64", @@ -3431,21 +3534,15 @@ dependencies = [ [[package]] name = "robust" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" - -[[package]] -name = "robust" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" [[package]] name = "rodio" -version = "0.17.1" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa" +checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" dependencies = [ "cpal", "symphonia", @@ -3482,9 +3579,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] @@ -3523,9 +3620,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -3537,14 +3634,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] @@ -3606,7 +3703,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cssparser", "derive_more", "fxhash", @@ -3621,38 +3718,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3661,9 +3758,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -3685,19 +3782,9 @@ 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.17" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" @@ -3763,15 +3850,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "smol" @@ -3779,22 +3866,22 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-net", "async-process", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -3802,13 +3889,13 @@ dependencies = [ [[package]] name = "spade" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" +checksum = "544b7011aca0c409a39df31cccdbf9962ea2f78597711ef2a58750d3cafd5b44" dependencies = [ + "hashbrown 0.14.2", "num-traits", - "optional", - "robust 0.2.3", + "robust", "smallvec", ] @@ -3883,9 +3970,9 @@ dependencies = [ [[package]] name = "supports-color" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ "is-terminal", "is_ci", @@ -4026,9 +4113,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4037,22 +4124,22 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml", + "toml 0.8.8", "version-compare", ] [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "temp-dir" @@ -4062,14 +4149,14 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall", - "rustix 0.38.9", + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -4086,9 +4173,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -4116,22 +4203,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -4146,17 +4233,6 @@ dependencies = [ ] [[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 = "tiny-skia-path" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4184,32 +4260,68 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "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.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +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.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -4217,6 +4329,22 @@ dependencies = [ ] [[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + +[[package]] name = "ttf-parser" version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4224,15 +4352,15 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "ttf-parser" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unic-bidi" @@ -4311,9 +4439,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" @@ -4350,15 +4478,15 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -4452,15 +4580,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -4468,21 +4596,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4490,24 +4612,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -4517,9 +4639,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4527,28 +4649,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -4562,20 +4684,21 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.24", ] [[package]] name = "wide" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" dependencies = [ "bytemuck", "safe_arch", @@ -4599,9 +4722,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4622,10 +4745,10 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -4764,9 +4887,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -4777,7 +4900,7 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e2aaaf8cfa92078c0c0375423d631f82f2f57979c2884fdd5f604a11e45329" dependencies = [ - "toml", + "toml 0.7.8", "version_check", ] @@ -4800,9 +4923,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmlwriter" @@ -4811,10 +4934,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[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.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "12a3946ecfc929b583800f4629b6c25b88ac6e92a40ea5670f77112a85d40a8b" [[package]] name = "zune-inflate" diff --git a/nixpkgs/pkgs/applications/graphics/rnote/default.nix b/nixpkgs/pkgs/applications/graphics/rnote/default.nix index e62359730eba..78e5be57ef68 100644 --- a/nixpkgs/pkgs/applications/graphics/rnote/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rnote/default.nix @@ -26,20 +26,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.8.2"; + version = "0.9.2"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-cIy2+Q6HSLwbT0XXDK88Z0mdu46vWSZNTVl8MphXhw0="; + hash = "sha256-LLJurn5KJBlTtFrQXcc7HZqtIATOLgiwJqUsZe4cRIo="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "ink-stroke-modeler-rs-0.1.0" = "sha256-WfZwezohm8+ZXiKZlssTX+b/Izk1M4jFwxQejeTfc6M="; - "librsvg-2.57.0-beta.2" = "sha256-8k5KWhm9PIpdmf2DByTyrqX5mGAa+a7ZDGmVO2ERhTU="; "piet-0.6.2" = "sha256-WrQok0T7uVQEp8SvNWlgqwQHfS7q0510bnP1ecr+s1Q="; }; }; @@ -81,7 +80,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - dos2unix build-aux/*.py # FIXME remove once updated to 0.9.0 chmod +x build-aux/*.py patchShebangs build-aux ''; @@ -91,7 +89,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}"; description = "Simple drawing application to create handwritten notes"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda yrd ]; + maintainers = with maintainers; [ dotlambda gepbird yrd ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/graphics/sane/xsane.nix b/nixpkgs/pkgs/applications/graphics/sane/xsane.nix index cd64c7b8d44e..471e2141b5b8 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/xsane.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/xsane.nix @@ -11,6 +11,7 @@ , gimpSupport ? false , gimp , nix-update-script +, fetchpatch }: stdenv.mkDerivation rec { @@ -25,6 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM="; }; + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/xsane/raw/rawhide/f/xsane-0.998-libpng.patch"; + hash = "sha256-0z292+Waa2g0PCQpUebdWprl9VDyBOY0XgqMJaIcRb8="; + }) + ]; + preConfigure = '' sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c chmod a+rX -R . diff --git a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix index 2dfc42c97ae4..2ab5c5562670 100644 --- a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix +++ b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix @@ -20,7 +20,7 @@ mkDerivation rec { homepage = "https://github.com/vigri/scantailor-advanced"; description = "Interactive post-processing tool for scanned pages (vigri's fork)"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; platforms = with platforms; gnu ++ linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index f7ee044d42ed..6f624747d688 100644 --- a/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.32.2"; + version = "0.32.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pd5T6HMhbfj1mWyWgnvtlj1sY1TgReF5bf0ybGGIwmM="; + sha256 = "sha256-4AD+5bPzYseRFPDs/44is0yaKGW1nkGi2j5NxdLKLDw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/snapshot/default.nix b/nixpkgs/pkgs/applications/graphics/snapshot/default.nix new file mode 100644 index 000000000000..a47016e379da --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/snapshot/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, lib +, fetchurl +, fetchpatch +, cargo +, desktop-file-utils +, meson +, ninja +, pkg-config +, rustc +, wrapGAppsHook4 +, glib +, gst_all_1 +, gtk4 +, libadwaita +, pipewire +, gnome +}: + +stdenv.mkDerivation rec { + pname = "snapshot"; + version = "45.0"; + + src = fetchurl { + url = "mirror://gnome/sources/snapshot/${lib.versions.major version}/snapshot-${version}.tar.xz"; + hash = "sha256-7keO4JBzGgsIJLZrsXRr2ADcv+h6yDWEmUSa85z822c="; + }; + + patches = [ + # Fix portal requests + # https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/168 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/snapshot/-/commit/6aec0f56d6bb994731c1309ac6e2cb822b82067e.patch"; + hash = "sha256-6tnOhhTQ3Rfl3nCw/rliLKkvZknvZKCQyeMKaTxYmok="; + }) + ]; + + nativeBuildInputs = [ + cargo + desktop-file-utils + meson + ninja + pkg-config + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk4 + libadwaita + pipewire # for device provider + ]; + + preFixup = '' + gappsWrapperArgs+=( + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + ) + ''; + + passthru.updateScript = gnome.updateScript { + packageName = "snapshot"; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/snapshot"; + description = "Take pictures and videos on your computer, tablet, or phone"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "snapshot"; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/sxiv/default.nix b/nixpkgs/pkgs/applications/graphics/sxiv/default.nix index fec378d38437..65450d515668 100644 --- a/nixpkgs/pkgs/applications/graphics/sxiv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/sxiv/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/muennich/sxiv"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ h7x4 ]; }; } diff --git a/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix b/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix index 2cc532d25104..14f4b26290c8 100644 --- a/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix +++ b/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix @@ -19,5 +19,12 @@ mkDerivation { postInstall = '' # added as an include directory by cmake files and fails to compile if it's missing mkdir -p "$dev/include/KF5" + + # This is a really disgusting hack, no idea how search paths work for kde, + # but apparently kde is looking in $out/$out rather than $out for this library. + # Having this symlink fixes kmail finding it and makes my html work (Yay!). + mkdir -p $out/$out/lib/grantlee/ + libpath=$(echo $out/lib/grantlee/*) + ln -s $libpath $out/$out/lib/grantlee/$(basename $libpath) ''; } diff --git a/nixpkgs/pkgs/applications/kde/kontact.nix b/nixpkgs/pkgs/applications/kde/kontact.nix index b8ccd9415efb..2218e19c231a 100644 --- a/nixpkgs/pkgs/applications/kde/kontact.nix +++ b/nixpkgs/pkgs/applications/kde/kontact.nix @@ -4,7 +4,8 @@ qtwebengine, kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem, akonadi, grantleetheme, kontactinterface, kpimtextedit, - mailcommon, libkdepim, pimcommon + mailcommon, libkdepim, pimcommon, + akregator, kaddressbook, kmail, knotes, korganizer, zanshin }: mkDerivation { @@ -21,5 +22,6 @@ mkDerivation { kcmutils kcrash kdbusaddons kparts kwindowsystem akonadi grantleetheme kontactinterface kpimtextedit mailcommon libkdepim pimcommon + akregator kaddressbook kmail knotes korganizer zanshin ]; } diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 049f4e90b29b..fdb5ec771fb8 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.12.5"; + version = "5.4.13.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-iIYA9BnHUfsB4J7VbSLKaRdJHMW/xULJxKfv8atfAd8="; + hash = "sha256-RQx+E/lxdSgB2ddNIeWOd/S2OMMiznXCbYUXdYKRvCM="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; @@ -56,7 +56,7 @@ buildDotnetModule rec { buildPlugin() { echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ - --output $out/lib/archisteamfarm/plugins/$1 --configuration Release \ + --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \ --framework=net7.0 } diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 6154d1ca6e2d..359090389d9a 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -56,12 +56,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.33.0"; sha256 = "0816lmn0varxwhdklhh5hdqp0xnfz3nlrvaf2wpkk5v1mq86216h"; }) (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.7.2"; sha256 = "09mf5kpxn1a1m8ciwklhh6ascx0yqpcs5r2hvmfj80j44n3qrwhm"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -75,11 +75,11 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.2"; sha256 = "08g9dpp766racnh90s1sy3ncl291majgq6v2604hfw1f6zkmbjqh"; }) + (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.TestPlatform.ObjectModel"; version = "17.7.2"; sha256 = "0xdjkdnrvnaxqgg38y5w1l3jbppigg68cc8q9jn0p21vn48bgrxq"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.2"; sha256 = "1szsg1iy77f0caxzkk0ihpp4ifbfnbdbn8k0wbbhbdprxj8pr356"; }) + (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.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) @@ -94,9 +94,9 @@ (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.5"; sha256 = "0jzfqa12l5vvxd2j684cnm29w19v386cpm11pw8h6prpf57affaj"; }) (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.5"; sha256 = "0li0sw04w0a4zms5jjv1ga45wxiqlcvaw8gi0wbhiifrdzz5yckb"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; }) + (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 = "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"; }) diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 4dad0b1f5b6b..a048f0a3e4fb 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "fceb2fb828cfa420c77dc5cde433fd519a6717d4"; + version = "c582499d60f0726b6ec7f0fd27bd533c1f67b937"; 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-gMQWly7HN5rIV9r72Qa+gHuBuQMs9sh09od4ja4sRGU="; + hash = "sha256-dTSYlswMWWRafieWqNDIi3qCBvNAkcmZWKhQgJiv2Ts="; }; - npmDepsHash = "sha256-UDCQTRpcPDcuvPzlqTu315EkGr5G0+z7qMSsPgYQacA="; + npmDepsHash = "sha256-0zzP1z3VO9Y4gBWJ+T7oHhKE/H2dzMUMg71BKupVcH4="; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/applications/misc/albert/default.nix b/nixpkgs/pkgs/applications/misc/albert/default.nix index d76231ee8c16..4bfeaea7d36a 100644 --- a/nixpkgs/pkgs/applications/misc/albert/default.nix +++ b/nixpkgs/pkgs/applications/misc/albert/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.22.14"; + version = "0.22.17"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-cAxdCjaCqEkwjL+OXW7ONkS7OpKfey3bUYmGzJyV+g8="; + sha256 = "sha256-2wu4bOQDKoZ4DDzTttXXRNDluvuJth7M1pCvJmYQ+f4="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/misc/bazecor/default.nix b/nixpkgs/pkgs/applications/misc/bazecor/default.nix index e84cf11b3389..894f2af320dd 100644 --- a/nixpkgs/pkgs/applications/misc/bazecor/default.nix +++ b/nixpkgs/pkgs/applications/misc/bazecor/default.nix @@ -5,13 +5,13 @@ appimageTools.wrapAppImage rec { pname = "bazecor"; - version = "1.3.6"; + version = "1.3.8"; src = appimageTools.extract { inherit pname version; src = fetchurl { - url = "https://github.com/Dygmalab/Bazecor/releases/download/v.${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-Mz7T/AAlyfMzdfy/ZV4AEP3ClTolwr2pPzkSCPL66/w="; + url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; + hash = "sha256-SwlSH5z0p9ZVoDQzj4GxO3g/iHG8zQZndE4TmqdMtZQ="; }; # 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.6/src/main/utils/udev.ts#L6 + # https://github.com/Dygmalab/Bazecor/blob/v1.3.8/src/main/utils/udev.ts#L6 extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index b8b7eb435acd..7779480fa08a 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.29.0"; + version = "7.1.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-w9mvMKm76w5sDfW0OYxhZuhIOYKdUH3tpiGlpKNC2kM="; + hash = "sha256-cKUV+tBZ5ZdXkoLdJPdURKnWP5B5gzCUQQehVQIRgko="; }; patches = [ @@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { zeroconf jeepney pycryptodome + xxhash # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ diff --git a/nixpkgs/pkgs/applications/misc/clipcat/Cargo.lock b/nixpkgs/pkgs/applications/misc/clipcat/Cargo.lock deleted file mode 100644 index 2de6f6644dc8..000000000000 --- a/nixpkgs/pkgs/applications/misc/clipcat/Cargo.lock +++ /dev/null @@ -1,2109 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "aho-corasick" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -dependencies = [ - "memchr", -] - -[[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 = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anyhow" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" - -[[package]] -name = "app_dirs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" -dependencies = [ - "ole32-sys", - "shell32-sys", - "winapi 0.2.8", - "xdg", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "async-stream" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-trait" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "beef" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474a626a67200bd107d44179bb3d4fc61891172d11696609264589be6a0e6a43" - -[[package]] -name = "bincode" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" -dependencies = [ - "byteorder", - "serde", -] - -[[package]] -name = "bindgen" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36" -dependencies = [ - "bitflags", - "cexpr", - "cfg-if 0.1.10", - "clang-sys", - "clap", - "env_logger 0.7.1", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "which 3.1.1", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "boxfnonce" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" - -[[package]] -name = "byteorder" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" - -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - -[[package]] -name = "cc" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cexpr" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" -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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", - "winapi 0.3.9", -] - -[[package]] -name = "clang-sys" -version = "0.29.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" -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 0.11.0", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clipcat" -version = "0.5.0" -dependencies = [ - "app_dirs", - "bincode", - "daemonize", - "futures", - "http", - "libc", - "prost", - "rocksdb", - "serde", - "serde_json", - "serde_with", - "skim", - "snafu", - "structopt", - "tokio", - "toml", - "tonic", - "tonic-build", - "tracing", - "tracing-futures", - "tracing-journald", - "tracing-subscriber", - "x11-clipboard", -] - -[[package]] -name = "const_fn" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.3", - "crossbeam-epoch 0.8.2", - "crossbeam-queue", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.1", - "crossbeam-utils 0.8.1", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" -dependencies = [ - "cfg-if 1.0.0", - "const_fn", - "crossbeam-utils 0.8.1", - "lazy_static", - "memoffset 0.6.1", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "lazy_static", -] - -[[package]] -name = "daemonize" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c24513e34f53b640819f0ac9f705b673fcf4006d7aab8778bee72ebfc89815" -dependencies = [ - "boxfnonce", - "libc", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "defer-drop" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ae055245e14ed411f56dddf2a78caae87c25d9d6a18fb61f398a596cad77b4" -dependencies = [ - "crossbeam-channel 0.4.4", - "once_cell", -] - -[[package]] -name = "derive_builder" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" -dependencies = [ - "darling", - "derive_builder_core", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "env_logger" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "futures" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65" - -[[package]] -name = "futures-executor" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500" - -[[package]] -name = "futures-macro" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6" - -[[package]] -name = "futures-task" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86" -dependencies = [ - "once_cell", -] - -[[package]] -name = "futures-util" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "proc-macro-hack", - "proc-macro-nested", - "slab", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[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", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "h2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", - "tracing-futures", -] - -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" - -[[package]] -name = "heck" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -dependencies = [ - "libc", -] - -[[package]] -name = "http" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "httparse" -version = "1.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" - -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "hyper" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project 1.0.5", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "jobserver" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" -dependencies = [ - "libc", -] - -[[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.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccac4b00700875e6a07c6cde370d44d32fa01c5a65cdd2fca6858c479d28bb3" - -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi 0.3.9", -] - -[[package]] -name = "librocksdb-sys" -version = "6.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09" -dependencies = [ - "bindgen", - "cc", - "glob", - "libc", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" - -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mio" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "miow" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" -dependencies = [ - "socket2", - "winapi 0.3.9", -] - -[[package]] -name = "multimap" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" - -[[package]] -name = "nix" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", -] - -[[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-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "ole32-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "once_cell" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pin-project" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" -dependencies = [ - "pin-project-internal 0.4.27", -] - -[[package]] -name = "pin-project" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" -dependencies = [ - "pin-project-internal 1.0.5", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "prost" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" -dependencies = [ - "bytes", - "heck", - "itertools", - "log", - "multimap", - "petgraph", - "prost", - "prost-types", - "tempfile", - "which 4.0.2", -] - -[[package]] -name = "prost-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prost-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" -dependencies = [ - "bytes", - "prost", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" -dependencies = [ - "getrandom 0.2.2", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rayon" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" -dependencies = [ - "autocfg", - "crossbeam-deque 0.8.0", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" -dependencies = [ - "crossbeam-channel 0.5.0", - "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.1", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", -] - -[[package]] -name = "regex-automata" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" -dependencies = [ - "byteorder", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "rocksdb" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6" -dependencies = [ - "libc", - "librocksdb-sys", -] - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.1", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.123" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.123" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42fa8fb0da0bf5aa7dd5d8fe1f9ec769833eb7cf97ff89942903809e600de908" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1197ff7de45494f290c1e3e1a6f80e108974681984c87a3e480991ef3d0f1950" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sharded-slab" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell32-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - -[[package]] -name = "signal-hook-registry" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" -dependencies = [ - "libc", -] - -[[package]] -name = "skim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac8dcb2f57eba70ce16c6844af6caa63dc642d404630aae5dc3b4cb48353962" -dependencies = [ - "beef", - "bitflags", - "chrono", - "clap", - "crossbeam", - "defer-drop", - "derive_builder", - "env_logger 0.6.2", - "fuzzy-matcher", - "lazy_static", - "log", - "nix", - "rayon", - "regex", - "shlex", - "time", - "timer", - "tuikit", - "unicode-width", - "vte", -] - -[[package]] -name = "slab" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "snafu" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7" -dependencies = [ - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "structopt" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "rand", - "redox_syscall 0.2.4", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "term" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5" -dependencies = [ - "dirs", - "winapi 0.3.9", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" -dependencies = [ - "once_cell", -] - -[[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 = "timer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b" -dependencies = [ - "chrono", -] - -[[package]] -name = "tokio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "pin-project-lite", - "signal-hook-registry", - "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio-macros" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-stream" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1981ad97df782ab506a1f43bf82c967326960d278acf3bf8279809648c3ff3ea" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba8f479158947373b6df40cf48f4779bb25c99ca3c661bd95e0ab1963ad8b0e" -dependencies = [ - "async-stream", - "async-trait", - "base64", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "percent-encoding", - "pin-project 1.0.5", - "prost", - "prost-derive", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e8546fd40d56d28089835c0a81bb396848103b00f888aea42d46eb5974df07" -dependencies = [ - "proc-macro2", - "prost-build", - "quote", - "syn", -] - -[[package]] -name = "tower" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd7b451959622e21de79261673d658a0944b835012c58c51878ea55957fb51a" -dependencies = [ - "futures-core", - "futures-util", - "indexmap", - "pin-project 1.0.5", - "rand", - "slab", - "tokio", - "tokio-stream", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" - -[[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.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d40a22fd029e33300d8d89a5cc8ffce18bb7c587662f54629e94c9de5487f3" -dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f080ea7e4107844ef4766459426fa2d5c1ada2e47edba05dc7fa99d9629f47" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "tracing-futures" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" -dependencies = [ - "pin-project 0.4.27", - "tracing", -] - -[[package]] -name = "tracing-journald" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe1f0ed2b7a5fcb6da2bc9e783587d9a0c8b9535e50224afe04e543eae8a2d6" -dependencies = [ - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-log" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-serde" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401" -dependencies = [ - "ansi_term 0.12.1", - "chrono", - "lazy_static", - "matchers", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "tuikit" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b14d0a62e5faec84af47c1e7804ff49092c6f05b890f52502928a45d9bbc6c1" -dependencies = [ - "bitflags", - "lazy_static", - "log", - "nix", - "term", - "unicode-width", -] - -[[package]] -name = "unicode-segmentation" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "utf8parse" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "vte" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf" -dependencies = [ - "utf8parse", -] - -[[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.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - -[[package]] -name = "which" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" -dependencies = [ - "libc", - "thiserror", -] - -[[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 = "x11-clipboard" -version = "0.6.0" -source = "git+https://github.com/xrelkd/x11-clipboard?tag=v0.6.0#de648ede312e6b236e3b92119a014cac064b9e38" -dependencies = [ - "xcb", -] - -[[package]] -name = "xcb" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62056f63138b39116f82a540c983cc11f1c90cd70b3d492a70c25eaa50bd22a6" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "xdg" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/nixpkgs/pkgs/applications/misc/clipcat/default.nix b/nixpkgs/pkgs/applications/misc/clipcat/default.nix index c25d1e52e165..c09d1f7e09ea 100644 --- a/nixpkgs/pkgs/applications/misc/clipcat/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipcat/default.nix @@ -1,48 +1,50 @@ -{ lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg -, pkg-config, llvmPackages, clang, protobuf, python3 }: +{ lib +, fetchFromGitHub +, rustPlatform +, protobuf +, xvfb-run +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.5.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - sha256 = "0rxl3ksjinw07q3p2vjqg80k3c6wx2q7pzpf2344zyfb4gkqzx1c"; + hash = "sha256-2Sh8VakHeAotdw1kkpRgNtLj1gnH1Ei7OC9INF/lkZo="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "x11-clipboard-0.6.0" = "sha256-dKx2kda5JC79juksP2qiO9yfeFCWymcYhGPSygQ0mrg="; - }; - }; - - # needed for internal protobuf c wrapper library - PROTOC = "${protobuf}/bin/protoc"; - PROTOC_INCLUDE = "${protobuf}/include"; + cargoHash = "sha256-cgyvIu56Ab3h6tgyQxtGsR0UPxgL65vb7fUAc0lMj5Q="; nativeBuildInputs = [ - pkg-config - - rustPlatform.bindgenHook - - rustfmt protobuf - - python3 - installShellFiles ]; - buildInputs = [ xorg.libxcb ]; - buildFeatures = [ "all" ]; + nativeCheckInputs = [ + xvfb-run + ]; + + useNextest = true; + + # cargo-nextest help us retry the failed test cases + NEXTEST_RETRIES = 5; + + # Some test cases interact with X11, we use xvfb-run here + checkPhase = '' + xvfb-run --auto-servernum cargo nextest run --release --workspace --no-fail-fast --no-capture + ''; postInstall = '' - installShellCompletion --bash completions/bash-completion/completions/* - installShellCompletion --fish completions/fish/completions/* - installShellCompletion --zsh completions/zsh/site-functions/* + for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do + installShellCompletion --cmd $cmd \ + --bash <($out/bin/$cmd completions bash) \ + --fish <($out/bin/$cmd completions fish) \ + --zsh <($out/bin/$cmd completions zsh) + done ''; meta = with lib; { @@ -51,5 +53,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; + mainProgram = "clipcatd"; }; } diff --git a/nixpkgs/pkgs/applications/misc/dasel/default.nix b/nixpkgs/pkgs/applications/misc/dasel/default.nix index 07069dce1ac3..fb954cef5c65 100644 --- a/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-zxTT/CkSbH40R7itXAx0zD+haHOoMep/W4KfalJQ/8w="; + hash = "sha256-frd4jNn5uruz9oX40ly/AR5I/uKRIfQ8IjOlIvlsOlY="; }; - vendorHash = "sha256-CbR0uHtha2OoHW9mcB1I2lGJbjerbZARVN/mTstv/Y0="; + vendorHash = "sha256-B3d+pbk0smBXqcJnac5he0TZPLiT1cLtz02OAGfqhC0="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/nixpkgs/pkgs/applications/misc/diebahn/Cargo.lock b/nixpkgs/pkgs/applications/misc/diebahn/Cargo.lock deleted file mode 100644 index 0a67c943da12..000000000000 --- a/nixpkgs/pkgs/applications/misc/diebahn/Cargo.lock +++ /dev/null @@ -1,1916 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[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.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" - -[[package]] -name = "async-trait" -version = "0.1.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.5", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cairo-rs" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-expr" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.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", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "chrono-tz" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf", -] - -[[package]] -name = "chrono-tz-build" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - -[[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 = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cxx" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.5", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.5", -] - -[[package]] -name = "diebahn" -version = "1.5.0" -dependencies = [ - "chrono", - "env_logger", - "gdk4", - "gettext-rs", - "gtk4", - "hafas-rs", - "libadwaita", - "log", - "once_cell", - "serde", - "serde_json", - "tokio", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "field-offset" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "futures-channel" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" - -[[package]] -name = "futures-executor" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" - -[[package]] -name = "futures-macro" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "futures-task" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" - -[[package]] -name = "futures-util" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" -dependencies = [ - "futures-core", - "futures-macro", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gio" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" -dependencies = [ - "anyhow", - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gobject-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed" -dependencies = [ - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "once_cell", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e21acdeb9a02b8cba83e65afbb8aa45f977785e50f1113407024c6b6256988" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hafas-rs" -version = "0.1.0" -source = "git+https://gitlab.com/Schmiddiii/hafas-rs?rev=494fa671ca9ec1bfd1118c695a7dedf500c2b88a#494fa671ca9ec1bfd1118c695a7dedf500c2b88a" -dependencies = [ - "async-trait", - "chrono", - "chrono-tz", - "hex", - "hyper", - "hyper-rustls", - "log", - "md-5", - "serde", - "serde_json", - "serde_repr", - "thiserror", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.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 = "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 = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls", - "rustls-native-certs", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "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 0.45.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libadwaita" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" -dependencies = [ - "bitflags", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "once_cell", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[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 = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.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-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 = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "pango" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parse-zoneinfo" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" -dependencies = [ - "regex", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" -dependencies = [ - "phf_generator", - "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_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", - "uncased", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "regex" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[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", - "untrusted", - "web-sys", - "winapi", -] - -[[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.36.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "serde" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.5", -] - -[[package]] -name = "serde_json" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.5", -] - -[[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 = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c2d1c76a26822187a1fbb5964e3fff108bc208f02e820ab9dac1234f6b388a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "temp-dir" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.5", -] - -[[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 = "tokio" -version = "1.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" -dependencies = [ - "autocfg", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.45.0", -] - -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" - -[[package]] -name = "toml_edit" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "uncased" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[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 = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -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", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -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-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "winnow" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" -dependencies = [ - "memchr", -] diff --git a/nixpkgs/pkgs/applications/misc/diebahn/default.nix b/nixpkgs/pkgs/applications/misc/diebahn/default.nix index ea7403464218..d8ac3cac8b5b 100644 --- a/nixpkgs/pkgs/applications/misc/diebahn/default.nix +++ b/nixpkgs/pkgs/applications/misc/diebahn/default.nix @@ -21,20 +21,19 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "1.5.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "diebahn"; rev = version; - hash = "sha256-WEjMtRXRmcbgCIQNJRlGYGQhem9W8nb/lsjft0oWxAk="; + hash = "sha256-IKQaCdUpLbZwySpaywGbbLtBGljNR+ltQkbCcJwQ/K4="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "hafas-rs-0.1.0" = "sha256-9YmWiief8Nux1ZkPTZjzer/qKAa5hORVn8HngMtKDxM="; - }; + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${src}"; + inherit src; + hash = "sha256-FlXAWMHrWnYXIWuG0wXDkxiJfNHlZmJFkYRfOxzIg1g="; }; nativeBuildInputs = [ @@ -70,9 +69,11 @@ stdenv.mkDerivation rec { }; meta = { - description = "GTK4 frontend for the travel information of the german railway"; + changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md"; + description = "Travel with all your train information in one place"; homepage = "https://gitlab.com/schmiddi-on-mobile/diebahn"; license = lib.licenses.gpl3Plus; + mainProgram = "diebahn"; maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/done/Cargo.lock b/nixpkgs/pkgs/applications/misc/done/Cargo.lock index ff28c7c7c58e..00698793f26e 100644 --- a/nixpkgs/pkgs/applications/misc/done/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/done/Cargo.lock @@ -3,6 +3,25 @@ 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 = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10,14 +29,20 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" 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" @@ -28,9 +53,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arc-swap" @@ -39,14 +64,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] +name = "async-compression" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d495b6dc0184693324491a5ac05f559acc97bf937ab31d7a1c33dd0016be6d2b" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] name = "async-trait" -version = "0.1.67" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.5", + "syn 2.0.29", ] [[package]] @@ -56,10 +116,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" -version = "0.21.0" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bitflags" @@ -68,6 +143,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -84,9 +165,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -99,16 +180,19 @@ name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] [[package]] name = "cairo-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cairo-sys-rs", - "glib 0.17.5", + "glib", "libc", "once_cell", "thiserror", @@ -116,28 +200,44 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ - "glib-sys 0.17.4", + "glib-sys", "libc", "system-deps", ] [[package]] +name = "cascade" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d499b43edbf784dd81e16f0395f5b4350a35b477da8a074251087adefc11cb52" + +[[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 = [ + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -148,18 +248,27 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time", + "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", +] + +[[package]] +name = "chrono-humanize" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" +dependencies = [ + "chrono", ] [[package]] @@ -173,6 +282,16 @@ dependencies = [ ] [[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -184,15 +303,45 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core_done" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "cascade", + "chrono", + "diesel", + "diesel_migrations", + "futures", + "graph-rs-sdk", + "http", + "keytar", + "libset", + "open", + "regex", + "reqwest", + "serde", + "serde_json", + "strum 0.25.0", + "strum_macros 0.25.2", + "tokio", + "tracing", + "tracing-subscriber", + "url", + "uuid", +] [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -207,49 +356,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -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.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -261,9 +367,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.93" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" +checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" dependencies = [ "cc", "cxxbridge-flags", @@ -273,9 +379,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.93" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" +checksum = "c4ce20f6b8433da4841b1dadfb9468709868022d829d5ca1f2ffbda928455ea3" dependencies = [ "cc", "codespan-reporting", @@ -283,40 +389,46 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.5", + "syn 2.0.29", ] [[package]] name = "cxxbridge-flags" -version = "1.0.93" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" +checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" [[package]] name = "cxxbridge-macro" -version = "1.0.93" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" +checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" dependencies = [ "proc-macro2", "quote", - "syn 2.0.5", + "syn 2.0.29", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] name = "derive-new" version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -329,32 +441,33 @@ dependencies = [ [[package]] name = "diesel" -version = "2.0.4" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72eb77396836a4505da85bae0712fa324b74acfe1876d7c2f7e694ef3d0ee373" +checksum = "d98235fdc2f355d330a8244184ab6b4b33c28679c0b4158f63138e51d6cf7e88" dependencies = [ "chrono", "diesel_derives", "libsqlite3-sys", + "time 0.3.28", ] [[package]] name = "diesel_derives" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4" +checksum = "e054665eaf6d97d1e7125512bb2d35d07c73ac86cc6920174cb42d1ab697a554" dependencies = [ - "proc-macro-error", + "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "diesel_migrations" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ae22beef5e9d6fab9225ddb073c1c6c1a7a6ded5019d5da11d1e5c5adc34e2" +checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" dependencies = [ "diesel", "migrations_internals", @@ -362,10 +475,19 @@ dependencies = [ ] [[package]] +name = "diesel_table_macro_syntax" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.29", +] + +[[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -402,29 +524,30 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "done" -version = "0.1.7" +version = "0.2.0" dependencies = [ "anyhow", "chrono", + "core_done", "derive-new", - "directories", - "done_local_storage", + "futures", "gettext-rs", - "glib 0.16.7", + "glib", "glib-build-tools", "i18n-embed", "i18n-embed-fl", + "libadwaita", "libset", "once_cell", "relm4", @@ -432,72 +555,51 @@ dependencies = [ "reqwest", "rust-embed", "serde", - "serde_json", - "strum", - "strum_macros", - "sysinfo", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "done_local_storage" -version = "0.1.0" -dependencies = [ - "anyhow", - "chrono", - "diesel", - "diesel_migrations", - "libset", - "serde", - "serde_json", - "tokio", - "tokio-stream", + "strum 0.25.0", + "strum_macros 0.25.2", "tracing", "tracing-subscriber", - "uuid", ] [[package]] name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - -[[package]] -name = "either" -version = "1.8.1" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "erased-serde" -version = "0.3.25" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.2.8" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -512,18 +614,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", "rustc_version", @@ -535,14 +634,14 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -594,15 +693,14 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", - "spin", + "spin 0.9.8", ] [[package]] @@ -628,9 +726,9 @@ 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", ] @@ -643,9 +741,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -658,9 +756,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -668,15 +766,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -685,38 +783,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -732,58 +830,56 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", - "glib 0.17.5", + "glib", "libc", "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ - "gio-sys 0.17.4", - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "system-deps", ] [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", "gio", - "glib 0.17.5", + "glib", "libc", "pango", ] [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys 0.17.4", - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "pango-sys", "pkg-config", @@ -792,9 +888,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -802,9 +898,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", "js-sys", @@ -834,18 +930,23 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] name = "gio" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", "futures-util", - "gio-sys 0.17.4", - "glib 0.17.5", + "gio-sys", + "glib", "libc", "once_cell", "pin-project-lite", @@ -855,25 +956,12 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" -dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "gio-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "glib-sys", + "gobject-sys", "libc", "system-deps", "winapi", @@ -881,42 +969,20 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys 0.16.3", - "glib-macros 0.16.3", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib" -version = "0.17.5" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", - "gio-sys 0.17.4", - "glib-macros 0.17.5", - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", "libc", "memchr", "once_cell", @@ -926,100 +992,158 @@ dependencies = [ [[package]] name = "glib-build-tools" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251935cb159350458a627642b0852a7fb8e027e3c5916dc2cebcd70f025de3fc" +checksum = "3431c56f463443cba9bc3600248bc6d680cb614c2ee1cdd39dab5415bd12ac5c" [[package]] name = "glib-macros" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] -name = "glib-macros" -version = "0.17.5" +name = "glib-sys" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ - "anyhow", - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", + "libc", + "system-deps", ] [[package]] -name = "glib-sys" -version = "0.16.3" +name = "gobject-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ + "glib-sys", "libc", "system-deps", ] [[package]] -name = "glib-sys" -version = "0.17.4" +name = "graph-core" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +checksum = "0f0fb786a3bfe3daa33f585534e871f04d3965d14398343d8818e12cefc02703" dependencies = [ - "libc", - "system-deps", + "Inflector", + "remain", + "serde", + "serde_json", + "strum 0.24.1", ] [[package]] -name = "gobject-sys" -version = "0.16.3" +name = "graph-error" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "8f20cdf0cafaa6345cec12d94614c3c3d9ae8abf60fbb9783f706610a80119b7" dependencies = [ - "glib-sys 0.16.3", - "libc", - "system-deps", + "base64", + "futures", + "handlebars", + "http", + "http-serde", + "reqwest", + "ring", + "serde", + "serde_json", + "thiserror", + "tokio", + "url", ] [[package]] -name = "gobject-sys" -version = "0.17.4" +name = "graph-http" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +checksum = "03724659be7b906ab31469dadf8b55191dceda793f52335cbd8b5be3ff9a3b3a" dependencies = [ - "glib-sys 0.17.4", - "libc", - "system-deps", + "async-stream", + "async-trait", + "bytes", + "futures", + "graph-core", + "graph-error", + "handlebars", + "http", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tokio", + "url", +] + +[[package]] +name = "graph-oauth" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "362697376221ab094832dc33fd11c5b85c891c9174f7d0a79032f1d03b065d94" +dependencies = [ + "base64", + "chrono", + "chrono-humanize", + "graph-error", + "reqwest", + "ring", + "serde", + "serde-aux", + "serde_json", + "strum 0.24.1", + "url", + "webbrowser", +] + +[[package]] +name = "graph-rs-sdk" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4aa7e7207ecb25d399023e7f6eb0433694f8f162c494e90059ec5d1d03a9da" +dependencies = [ + "graph-core", + "graph-error", + "graph-http", + "graph-oauth", + "handlebars", + "lazy_static", + "reqwest", + "serde", + "serde_json", + "url", ] [[package]] name = "graphene-rs" -version = "0.17.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ - "glib 0.17.5", + "glib", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ - "glib-sys 0.17.4", + "glib-sys", "libc", "pkg-config", "system-deps", @@ -1027,14 +1151,13 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags", "cairo-rs", "gdk4", - "glib 0.17.5", + "glib", "graphene-rs", "gsk4-sys", "libc", @@ -1043,14 +1166,14 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "glib-sys", + "gobject-sys", "graphene-sys", "libc", "pango-sys", @@ -1059,32 +1182,30 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags", "cairo-rs", "field-offset", "futures-channel", "gdk-pixbuf", "gdk4", "gio", - "glib 0.17.5", + "glib", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e21acdeb9a02b8cba83e65afbb8aa45f977785e50f1113407024c6b6256988" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1096,16 +1217,16 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys 0.17.4", - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "gio-sys", + "glib-sys", + "gobject-sys", "graphene-sys", "gsk4-sys", "libc", @@ -1115,14 +1236,12 @@ dependencies = [ [[package]] name = "gvdb" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6fc5915836ff1779eb9455810dad729811334b1026d4316eaf89c3a415e32ea" +checksum = "7473589355e97ab7ab46549d3786406d6fcad8837c94bb7874c18a8a3ae653fc" dependencies = [ "byteorder", "flate2", - "lazy_static", - "memmap2", "quick-xml", "safe-transmute", "serde", @@ -1133,9 +1252,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1143,7 +1262,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1151,12 +1270,43 @@ dependencies = [ ] [[package]] +name = "handlebars" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af92141a22acceb515fb6b13ac59d6d0b3dd3437e13832573af8e0d3247f29d5" +dependencies = [ + "hashbrown 0.5.0", + "log", + "pest", + "pest_derive", + "quick-error", + "serde", + "serde_json", + "walkdir", +] + +[[package]] +name = "hashbrown" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" +dependencies = [ + "serde", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1164,18 +1314,18 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] [[package]] name = "http" @@ -1200,6 +1350,16 @@ dependencies = [ ] [[package]] +name = "http-serde" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +dependencies = [ + "http", + "serde", +] + +[[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1207,15 +1367,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.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1228,7 +1388,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1250,23 +1410,23 @@ dependencies = [ [[package]] name = "i18n-config" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9f93ceee6543011739bc81699b5e0cf1f23f3a80364649b6d80de8636bc8df" +checksum = "b987084cadad6e2f2b1e6ea62c44123591a3c044793a1beabf71a8356ea768d5" dependencies = [ "log", "serde", "serde_derive", "thiserror", - "toml", + "toml 0.7.6", "unic-langid", ] [[package]] name = "i18n-embed" -version = "0.13.8" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2653dd1a8be0726315603f1c180b29f90e5b2a58f8b943d949d5170d9ad81101" +checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" dependencies = [ "arc-swap", "fluent", @@ -1286,9 +1446,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b5809e2295beeb55013705c3b947cbbe83b8cadf3c73a1e6dca06381927212a" +checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" dependencies = [ "dashmap", "find-crate", @@ -1301,15 +1461,15 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.29", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db2330e035808eb064afb67e6743ddce353763af3e0f2bdfc2476e00ce76136" +checksum = "e9a95d065e6be4499e50159172395559a388d20cf13c84c77e4a1e341786f219" dependencies = [ "find-crate", "i18n-config", @@ -1320,9 +1480,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.54" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1334,19 +1494,18 @@ dependencies = [ [[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.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1354,21 +1513,22 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] -name = "instant" -version = "0.1.12" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "cfg-if", + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -1391,38 +1551,89 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.9" +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-docker" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.45.0", + "once_cell", ] [[package]] -name = "ipnet" -version = "2.7.1" +name = "is-wsl" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +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 = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] +name = "keytar" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d361c55fba09829ac620b040f5425bf239b1030c3d6820a84acac8da867dca4d" +dependencies = [ + "keytar-sys", +] + +[[package]] +name = "keytar-sys" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe908c6896705a1cb516cd6a5d956c63f08d95ace81b93253a98cd93e1e6a65a" +dependencies = [ + "cc", + "cxx", + "cxx-build", + "pkg-config", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1430,33 +1641,30 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.3.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags", - "futures-channel", "gdk-pixbuf", "gdk4", "gio", - "glib 0.17.5", + "glib", "gtk4", "libadwaita-sys", "libc", - "once_cell", "pango", ] [[package]] name = "libadwaita-sys" -version = "0.3.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", - "gio-sys 0.17.4", - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "gio-sys", + "glib-sys", + "gobject-sys", "gtk4-sys", "libc", "pango-sys", @@ -1465,9 +1673,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libset" @@ -1481,7 +1689,7 @@ dependencies = [ "erased-serde", "serde", "serde_json", - "toml", + "toml 0.5.11", "walkdir", ] @@ -1497,18 +1705,18 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "locale_config" @@ -1525,9 +1733,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1535,12 +1743,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "malloc_buf" @@ -1553,43 +1758,34 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "migrations_internals" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c493c09323068c01e54c685f7da41a9ccf9219735c3766fbfd6099806ea08fbc" +checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" dependencies = [ "serde", - "toml", + "toml 0.7.6", ] [[package]] name = "migrations_macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8ff27a350511de30cdabb77147501c36ef02e0451d957abea2f30caffb2b58" +checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" dependencies = [ "migrations_internals", "proc-macro2", @@ -1604,23 +1800,22 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1651,13 +1846,10 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.4.0" +name = "ndk-context" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" -dependencies = [ - "winapi", -] +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "nu-ansi-term" @@ -1670,31 +1862,21 @@ dependencies = [ ] [[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-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" 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", ] @@ -1728,18 +1910,38 @@ dependencies = [ ] [[package]] +name = "object" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "open" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] [[package]] name = "openssl" -version = "0.10.47" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b277f87dacc05a6b709965d1cbafac4649d6ce9f3ce9ceb88508b5666dfec9" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -1750,13 +1952,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -1767,11 +1969,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.82" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95792af3c4e0153c3914df2261bedd30a98476f94dc892b67dfe1d89d433a04" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1786,13 +1987,12 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags", "gio", - "glib 0.17.5", + "glib", "libc", "once_cell", "pango-sys", @@ -1800,12 +2000,12 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "glib-sys 0.17.4", - "gobject-sys 0.17.4", + "glib-sys", + "gobject-sys", "libc", "system-deps", ] @@ -1822,48 +2022,79 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "pin-project" -version = "1.0.12" +name = "pest" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" dependencies = [ - "pin-project-internal", + "memchr", + "thiserror", + "ucd-trie", ] [[package]] -name = "pin-project-internal" -version = "1.0.12" +name = "pest_derive" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +dependencies = [ + "pest", + "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", +] + +[[package]] +name = "pest_meta" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +dependencies = [ + "once_cell", + "pest", + "sha2", ] [[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" @@ -1873,9 +2104,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro-crate" @@ -1913,18 +2144,24 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] name = "quick-xml" -version = "0.27.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", "serde", @@ -1932,42 +2169,35 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] -name = "rayon" -version = "1.7.0" +name = "raw-window-handle" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] -name = "rayon-core" -version = "1.11.0" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1977,15 +2207,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.2" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -1994,15 +2236,15 @@ dependencies = [ [[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 = "relm4" -version = "0.6.0-beta.1" +version = "0.7.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f169f698ce2e487eed2306898fcf262224a287d0e81480db4190e74cfec412cf" +checksum = "d307673e36bb450a4823d500d661f53e1622a685b330149c193b791687146b3f" dependencies = [ "async-trait", "flume", @@ -2018,9 +2260,9 @@ dependencies = [ [[package]] name = "relm4-icons" -version = "0.6.0-beta.3" +version = "0.7.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f935f60b913b1e9de3e847f949945fb7c8d1555936d68c89d82b787a1c75df0" +checksum = "5ac16f5e6ed25fbd23c667f060fdc2f320d317a3997063503cbdeffb14dcaf06" dependencies = [ "gtk4", "gvdb", @@ -2028,21 +2270,33 @@ dependencies = [ [[package]] name = "relm4-macros" -version = "0.6.0-beta.1" +version = "0.7.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa06febb3685960e7c1c44e21e44a3829325940b31d1e91391a43c32020c201" +checksum = "9d1892cdfb2df6c8bbe5a84451d3979125255e31437c0bfd14c81bde93ff0cf6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", +] + +[[package]] +name = "remain" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bce3a7139d2ee67d07538ee5dba997364fbc243e7e7143e96eb830c74bfaa082" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", ] [[package]] name = "reqwest" -version = "0.11.15" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ + "async-compression", "base64", "bytes", "encoding_rs", @@ -2066,19 +2320,36 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "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", +] + +[[package]] name = "rust-embed" -version = "6.6.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb133b9a38b5543fad3807fb2028ea47c5f2b566f4f5e28a11902f1a358348b6" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -2087,28 +2358,34 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.5.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 1.0.109", + "syn 2.0.29", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "7.5.0" +version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ "sha2", "walkdir", ] [[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" @@ -2125,29 +2402,28 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.11" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[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.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe-transmute" @@ -2166,32 +2442,32 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.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" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2200,9 +2476,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2216,35 +2492,46 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] +name = "serde-aux" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3dfe1b7eb6f9dcf011bd6fad169cdeaae75eda0d61b1a99a3f015b41b0cae39" +dependencies = [ + "chrono", + "serde", + "serde_json", +] + +[[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.5", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2252,6 +2539,15 @@ dependencies = [ ] [[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2265,9 +2561,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -2294,18 +2590,18 @@ 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.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -2318,10 +2614,26 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "spin" -version = "0.9.6" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -2343,6 +2655,15 @@ name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros 0.24.3", +] + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" @@ -2358,21 +2679,23 @@ dependencies = [ ] [[package]] -name = "syn" -version = "1.0.109" +name = "strum_macros" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" dependencies = [ + "heck", "proc-macro2", "quote", - "unicode-ident", + "rustversion", + "syn 2.0.29", ] [[package]] name = "syn" -version = "2.0.5" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c2d1c76a26822187a1fbb5964e3fff108bc208f02e820ab9dac1234f6b388a" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -2380,34 +2703,36 @@ dependencies = [ ] [[package]] -name = "sysinfo" -version = "0.27.8" +name = "syn" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "system-deps" -version = "6.0.3" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml", + "toml 0.7.6", "version-compare", ] [[package]] +name = "target-lexicon" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" + +[[package]] name = "temp-dir" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2415,15 +2740,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.4.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -2437,22 +2762,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.5", + "syn 2.0.29", ] [[package]] @@ -2477,6 +2802,34 @@ dependencies = [ ] [[package]] +name = "time" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +dependencies = [ + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +dependencies = [ + "time-core", +] + +[[package]] name = "tinystr" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2502,32 +2855,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -2541,21 +2894,10 @@ dependencies = [ ] [[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-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -2575,18 +2917,35 @@ dependencies = [ ] [[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -2611,20 +2970,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -2643,9 +3002,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -2677,6 +3036,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] name = "unic-langid" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2703,9 +3068,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2723,21 +3088,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] name = "uuid" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", ] @@ -2778,11 +3150,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -2800,9 +3171,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2810,24 +3181,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2837,9 +3208,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2847,34 +3218,64 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-streams" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] +name = "webbrowser" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" +dependencies = [ + "core-foundation", + "home", + "jni", + "log", + "ndk-context", + "objc", + "raw-window-handle", + "url", + "web-sys", +] + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2907,35 +3308,29 @@ 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", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2944,13 +3339,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] @@ -2960,64 +3370,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] name = "winnow" -version = "0.3.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[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", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] name = "zvariant" -version = "3.12.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" dependencies = [ "byteorder", "libc", @@ -3028,9 +3481,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3041,9 +3494,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", diff --git a/nixpkgs/pkgs/applications/misc/done/default.nix b/nixpkgs/pkgs/applications/misc/done/default.nix index 86089abea5d0..a52ebda61945 100644 --- a/nixpkgs/pkgs/applications/misc/done/default.nix +++ b/nixpkgs/pkgs/applications/misc/done/default.nix @@ -12,20 +12,22 @@ , gdk-pixbuf , gtk4 , libadwaita +, libsecret , openssl , sqlite , darwin +, gettext }: stdenv.mkDerivation rec { pname = "done"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "done-devs"; repo = "done"; rev = "v${version}"; - hash = "sha256-MLCb96jr3YWODZ6xh4fcyFnL5RjFDcEjHKnDD8Gysy8="; + hash = "sha256-97bWBayEyhCMjTxxxFVdO8V2pBZuVzss1Tp9/TnfDB0="; }; cargoDeps = rustPlatform.importCargoLock { @@ -51,12 +53,19 @@ stdenv.mkDerivation rec { gdk-pixbuf gtk4 libadwaita + libsecret openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.AppKit ]; + 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; { description = "The ultimate task management solution for seamless organization and efficiency"; homepage = "https://done.edfloreshz.dev/"; diff --git a/nixpkgs/pkgs/applications/misc/downonspot/Cargo.lock.patch b/nixpkgs/pkgs/applications/misc/downonspot/Cargo.lock.patch new file mode 100644 index 000000000000..e224603a3070 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/downonspot/Cargo.lock.patch @@ -0,0 +1,97 @@ +diff --git a/Cargo.lock b/Cargo.lock +index e6f1267..3bf16a5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1632,7 +1632,8 @@ dependencies = [ + [[package]] + name = "librespot" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea4c9952ef48968f8184a4a87f8576982426ebe623342d5a28f7d9c4978e4a44" + dependencies = [ + "base64 0.13.1", + "env_logger", +@@ -1658,7 +1659,8 @@ dependencies = [ + [[package]] + name = "librespot-audio" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d" + dependencies = [ + "aes-ctr", + "byteorder", +@@ -1673,7 +1675,8 @@ dependencies = [ + [[package]] + name = "librespot-connect" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ffafb6a443e9445ccb3d5d591573b5b1da3c89a9b8846c63ba2c3710210d3ec" + dependencies = [ + "form_urlencoded", + "futures-util", +@@ -1693,7 +1696,8 @@ dependencies = [ + [[package]] + name = "librespot-core" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d" + dependencies = [ + "aes", + "base64 0.13.1", +@@ -1733,7 +1737,8 @@ dependencies = [ + [[package]] + name = "librespot-discovery" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2aa877d18f6150364012cb4be5682d62d7c712c88bae2d0d01720fd7c15e2f06" + dependencies = [ + "aes-ctr", + "base64 0.13.1", +@@ -1754,7 +1759,8 @@ dependencies = [ + [[package]] + name = "librespot-metadata" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c" + dependencies = [ + "async-trait", + "byteorder", +@@ -1767,7 +1773,8 @@ dependencies = [ + [[package]] + name = "librespot-playback" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7" + dependencies = [ + "byteorder", + "cpal", +@@ -1792,7 +1799,8 @@ dependencies = [ + [[package]] + name = "librespot-protocol" + version = "0.4.2" +-source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git#f28fa264528dc85f8f325c18e8461b0f2b43dca1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f" + dependencies = [ + "glob", + "protobuf 2.28.0", +diff --git a/Cargo.toml b/Cargo.toml +index 40ca2c1..734a3fb 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -29,7 +29,7 @@ reqwest = "0.11" + colored = "2" + lame = "0.1" + aspotify = "0.7.1" +-librespot = { git = "ssh://git@github.com/oSumAtrIX/free-librespot.git" } ++librespot = "0.4.2" + async-std = { version = "1.12", features = ["attributes", "tokio1"] } + serde_json = "1.0" + async-stream = "0.3" diff --git a/nixpkgs/pkgs/applications/misc/downonspot/default.nix b/nixpkgs/pkgs/applications/misc/downonspot/default.nix index 4764fc4d5e63..23747102fecb 100644 --- a/nixpkgs/pkgs/applications/misc/downonspot/default.nix +++ b/nixpkgs/pkgs/applications/misc/downonspot/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "downonspot"; - version = "unstable-2021-10-13"; + version = "unstable-2023-11-26"; src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; - rev = "9d78ea2acad4dfe653a895a1547ad0abe7c5b47a"; - sha256 = "03g99yx9sldcg3i6hvpdxyk70f09f8kfj3kh283vl09b1a2c477w"; + rev = "406fbf137306208bcb9835ad3aa92b0edbc01805"; + hash = "sha256-gY5pDZ5EwKhBmV8VyuKW/19BgfPSIZSp9rEI/GuonYQ="; }; - cargoSha256 = "0k200p6wgwb60ax1r8mjn3aq08zxpkqbfqpi3b25zi3xf83my44d"; + # Use official public librespot version + cargoPatches = [ ./Cargo.lock.patch ]; - # fixes: error: the option `Z` is only accepted on the nightly compiler - RUSTC_BOOTSTRAP = 1; + cargoHash = "sha256-CG9QY9Nfy/dxzvSPG2NB2/6yjTvdoDI76PRSaM138Wk="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/applications/misc/flowtime/default.nix b/nixpkgs/pkgs/applications/misc/flowtime/default.nix index 17d6923f84cf..6ede1b080f25 100644 --- a/nixpkgs/pkgs/applications/misc/flowtime/default.nix +++ b/nixpkgs/pkgs/applications/misc/flowtime/default.nix @@ -13,20 +13,23 @@ , desktop-file-utils , glib , pkg-config +, libportal-gtk4 +, blueprint-compiler }: stdenv.mkDerivation rec { pname = "flowtime"; - version = "3.1"; + version = "6.1"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Flowtime"; rev = "v${version}"; - hash = "sha256-aXGdHFj9P8+33VuR8YBi+YYN/vBn94drmtKzNDc4SAY="; + hash = "sha256-wTqHTkt1O3Da2fzxf6DiQjrqOt65ZEhLOkGK5C6HzIk="; }; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils glib gobject-introspection @@ -41,6 +44,7 @@ stdenv.mkDerivation rec { libadwaita libxml2 libgee + libportal-gtk4 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base @@ -51,6 +55,6 @@ stdenv.mkDerivation rec { description = "Get what motivates you done, without losing concentration"; homepage = "https://github.com/Diego-Ivan/Flowtime"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ foo-dogsquared ]; + maintainers = with maintainers; [ foo-dogsquared pokon548 ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/fnott/default.nix b/nixpkgs/pkgs/applications/misc/fnott/default.nix deleted file mode 100644 index c46ce82ea3ff..000000000000 --- a/nixpkgs/pkgs/applications/misc/fnott/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv -, lib -, fetchFromGitea -, pkg-config -, meson -, ninja -, scdoc -, wayland-scanner -, fontconfig -, freetype -, pixman -, libpng -, tllist -, wayland -, wayland-protocols -, dbus -, fcft -}: - -stdenv.mkDerivation rec { - pname = "fnott"; - version = "1.4.1"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "dnkl"; - repo = "fnott"; - rev = version; - sha256 = "sha256-8SKInlj54BP3Gn/DNVoLN62+Dfa8G5d/q2xGUXXdsjo="; - }; - - depsBuildBuild = [ - pkg-config - ]; - nativeBuildInputs = [ - pkg-config - meson - ninja - scdoc - wayland-scanner - ]; - buildInputs = [ - fontconfig - freetype - pixman - libpng - tllist - wayland - wayland-protocols - dbus - fcft - ]; - - meta = with lib; { - homepage = "https://codeberg.org/dnkl/fnott"; - description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; - license = with licenses; [ mit zlib ]; - maintainers = with maintainers; [ polykernel ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index a80a86317a56..dc247264775d 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.2"; + version = "1.26.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-Agccsz0TlzCDnhR5Vy7Tt3jrqz9+hwaclQgXJBhGY9w="; + sha256 = "sha256-M8EP0YbyJhOUPrghYA2jDQ/CpyD98d27l94uEj4YEpM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/gcal/default.nix b/nixpkgs/pkgs/applications/misc/gcal/default.nix index da190218d095..a6b98ccccf08 100644 --- a/nixpkgs/pkgs/applications/misc/gcal/default.nix +++ b/nixpkgs/pkgs/applications/misc/gcal/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { }) ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; + enableParallelBuilding = true; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; diff --git a/nixpkgs/pkgs/applications/misc/gcstar/default.nix b/nixpkgs/pkgs/applications/misc/gcstar/default.nix index 0ab40b034503..4a6b45469d27 100644 --- a/nixpkgs/pkgs/applications/misc/gcstar/default.nix +++ b/nixpkgs/pkgs/applications/misc/gcstar/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gcstar"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitLab { owner = "Kerenoc"; repo = "GCstar"; rev = "v${version}"; - sha256 = "1hah8ijh9mvcgbh36y3d3s6y79mzz27w24f2i29qllv7cayf6129"; + sha256 = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix index 240370297d10..35a39918b165 100644 --- a/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix +++ b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix @@ -49,7 +49,7 @@ perlPackages.buildPerlPackage rec { license = licenses.gpl3Plus; homepage = "https://github.com/get-iplayer/get_iplayer"; platforms = platforms.all; - maintainers = with maintainers; [ rika jgarcia ]; + maintainers = with maintainers; [ rika chewblacka ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix b/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix index 676a19641bdb..046e296489b6 100644 --- a/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , meson , ninja , pkg-config @@ -12,11 +12,12 @@ , gobject-introspection , desktop-file-utils , appstream-glib -, libadwaita }: +, libadwaita +}: python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "7.2"; + version = "8.0"; format = "other"; src = fetchFromGitLab { @@ -24,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - hash = "sha256-CE0iuXYHBhu07mjfXCnAPZQUD1Wy95L+tvBT+uepbrk="; + hash = "sha256-SEPQjl6hd8IBs0c0LBEYaqn2n8CGQmYSEMJp5yoL/PA="; }; nativeBuildInputs = [ @@ -67,5 +68,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ mvnetbiz ]; + mainProgram = "secrets"; }; } diff --git a/nixpkgs/pkgs/applications/misc/gnome-solanum/default.nix b/nixpkgs/pkgs/applications/misc/gnome-solanum/default.nix index a93f55683b6f..4c507edfb06f 100644 --- a/nixpkgs/pkgs/applications/misc/gnome-solanum/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnome-solanum/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , rustPlatform , cargo , desktop-file-utils @@ -22,20 +21,20 @@ stdenv.mkDerivation rec { pname = "solanum"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Solanum"; rev = version; - hash = "sha256-ohUwxwhPxZlKoP5Nq/daD9z5Nj37C7MnFzyvQKp7R8E="; + hash = "sha256-Xf/b/9o6zHF1hjHSyAXb90ySoBj+DMMe31e6RfF8C4Y="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-eDwMBxMmj246tplZfREJkViCDbKmuWSUZyM+tChNQDA="; + hash = "sha256-POvKpwzi+bkEkfSDhi/vjs/ey+A2vNN5ta4Q7Ma/RBQ="; }; postPatch = '' @@ -72,5 +71,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ linsui ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "solanum"; }; } diff --git a/nixpkgs/pkgs/applications/misc/gnome-tecla/default.nix b/nixpkgs/pkgs/applications/misc/gnome-tecla/default.nix new file mode 100644 index 000000000000..43f77763f129 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/gnome-tecla/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, glib +, gtk4 +, libadwaita +, libxkbcommon +, wayland +, gnome +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tecla"; + version = "45.0"; + + src = fetchurl { + url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; + hash = "sha256-XAK7QBmxz/tWY9phB1A+/4U4Nqh4PdRwXdBKSfetwls="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + libxkbcommon + wayland + ]; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gnome-tecla"; + packageName = "tecla"; + }; + }; + + meta = with lib; { + description = "Keyboard layout viewer"; + homepage = "https://gitlab.gnome.org/GNOME/tecla"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + mainProgram = "tecla"; + }; +}) diff --git a/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix b/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix index a1b92572679c..179facc64fd5 100644 --- a/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -7,23 +8,23 @@ , gettext , libxml2 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook4 , glib -, gtk3 +, gtk4 +, libadwaita +, libgee , libgtop -, libdazzle , gnome , tracker -, libhandy }: stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "3.38.1"; + version = "45.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "mMdm4X4VZXEfx0uaJP0u0NX618y0VRlhLdTiFHaO05M="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "5nfE/iwBSXqE/x4RV+kTHp+ZmfGnjTUjSvHXfYJ18pQ="; }; nativeBuildInputs = [ @@ -34,17 +35,16 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - gnome.adwaita-icon-theme - gtk3 - libdazzle + gtk4 + libadwaita + libgee libgtop tracker - libhandy ]; postPatch = '' @@ -60,7 +60,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A nice way to view information about use of system resources, like memory and disk space"; - license = licenses.gpl3; + homepage = "https://gitlab.gnome.org/GNOME/gnome-usage"; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/nixpkgs/pkgs/applications/misc/gum/default.nix b/nixpkgs/pkgs/applications/misc/gum/default.nix index 96315bb50c24..d5dc1c84f761 100644 --- a/nixpkgs/pkgs/applications/misc/gum/default.nix +++ b/nixpkgs/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-qPo7PmxNCEjrGWNZ/CBpGrbjevbcmnDGy/C1F1TT9zA="; + hash = "sha256-hJuFfdUeUUIjTBRtUo2x24BDuMPPkkReGLFDZSHR9pA="; }; - vendorHash = "sha256-47rrSj2bI8oe62CSlxrSBsEPM4I6ybDKzrctTB2MFB0="; + vendorHash = "sha256-tEeP8i2I9/Q4tuswkeV1S3jpc7saLxtzzLQxcPUh1sM="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index ef9be284b59d..d8b81ce8bebc 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.120.3"; + version = "0.120.4"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-96ikGGKw9IN/ch199oFcucp8aVR+fEiAWBeu39J2Osw="; + hash = "sha256-eBDlX+3Gb4bWRJ0ITwlx1c3q1RCFK2tyuKn9SALHbhI="; }; vendorHash = "sha256-kUKnoUQzLbi0ssxvK2viNTHLtqx8vaHLYXO8ZWU2rmw="; diff --git a/nixpkgs/pkgs/applications/misc/inlyne/default.nix b/nixpkgs/pkgs/applications/misc/inlyne/default.nix index 5cecae9db664..01ce66abc7fb 100644 --- a/nixpkgs/pkgs/applications/misc/inlyne/default.nix +++ b/nixpkgs/pkgs/applications/misc/inlyne/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "inlyne"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "trimental"; repo = pname; rev = "v${version}"; - hash = "sha256-B+H3G4jVysqrzWIP+1hktSGnycZLizxhmBCO/lYIr0I="; + hash = "sha256-DSi6iS1ySdvGf6FxZpsDOAFpAKx/APcZjxA3Qy0gQBU="; }; - cargoHash = "sha256-LFL2DVKu/UM7effikZN/IhSD6DrlwO+CF+S60PXULa0="; + cargoHash = "sha256-UzegSJGAOBUDN8WluN7fLWS7NfHhm9YY0Zuq6DCIqHo="; nativeBuildInputs = [ installShellFiles @@ -41,6 +41,12 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk_11_0.frameworks.AppKit ]; + checkFlags = lib.optionals stdenv.isDarwin [ + # time out on darwin + "--skip=interpreter::tests::centered_image_with_size_align_and_link" + "--skip=watcher::tests::the_gauntlet" + ]; + postInstall = '' installShellCompletion --cmd inlyne \ --bash <($out/bin/inlyne --gen-completions bash) \ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/Cargo.lock b/nixpkgs/pkgs/applications/misc/insulator2/Cargo.lock index 9a7f7d01206e..e119d57c4d10 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/insulator2/Cargo.lock @@ -3,40 +3,26 @@ version = 3 [[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" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aead" -version = "0.4.3" +name = "adler32" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", - "rand_core", -] +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] -name = "aes" -version = "0.8.3" +name = "ahash" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures", - "zeroize", + "getrandom 0.2.8", + "once_cell", + "version_check", ] [[package]] @@ -52,39 +38,29 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.3" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "allocator-api2" -version = "0.2.16" +name = "alloc-no-stdlib" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] -name = "ammonia" -version = "3.3.0" +name = "alloc-stdlib" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" dependencies = [ - "html5ever", - "maplit", - "once_cell", - "tendril", - "url", + "alloc-no-stdlib", ] [[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -95,76 +71,64 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" - -[[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" - -[[package]] -name = "arrayref" -version = "0.3.7" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +name = "apache-avro" +version = "0.15.0" +source = "git+https://github.com/apache/avro?rev=b8b83b72f7184cf1b388fc20331d11eabbd93e06#b8b83b72f7184cf1b388fc20331d11eabbd93e06" dependencies = [ + "byteorder", + "digest", + "lazy_static", + "libflate", + "log", + "num-bigint", + "quad-rand", + "rand 0.8.5", + "regex", "serde", + "serde_json", + "strum", + "strum_macros", + "thiserror", + "typed-builder", + "uuid", + "zerocopy", ] [[package]] -name = "ashpd" -version = "0.4.0" +name = "arrayvec" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "gdk4-wayland", - "gdk4-x11", - "gtk4", - "libc", - "once_cell", - "pipewire", - "rand", - "serde", - "serde_repr", - "tokio", - "tracing", - "url", - "zbus", -] +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "assign" -version = "1.1.1" +name = "ascii-canvas" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] [[package]] -name = "async-broadcast" -version = "0.5.1" +name = "assert-json-diff" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "event-listener", - "futures-core", + "serde", + "serde_json", ] [[package]] name = "async-channel" -version = "1.9.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", "event-listener", @@ -172,28 +136,15 @@ dependencies = [ ] [[package]] -name = "async-compression" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] name = "async-executor" -version = "1.5.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand", "futures-lite", "slab", ] @@ -215,44 +166,48 @@ dependencies = [ [[package]] name = "async-io" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ "async-lock", "autocfg", - "cfg-if", "concurrent-queue", "futures-lite", + "libc", "log", "parking", "polling", - "rustix 0.37.23", "slab", - "socket2 0.4.9", + "socket2", "waker-fn", + "windows-sys 0.42.0", ] [[package]] name = "async-lock" -version = "2.8.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" dependencies = [ "event-listener", + "futures-lite", ] [[package]] -name = "async-once-cell" -version = "0.5.3" +name = "async-object-pool" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" +checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" +dependencies = [ + "async-std", +] [[package]] name = "async-process" -version = "1.7.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" dependencies = [ "async-io", "async-lock", @@ -261,30 +216,9 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix 0.37.23", + "libc", "signal-hook", - "windows-sys", -] - -[[package]] -name = "async-recursion" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "async-rx" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30de4e5329a0947e389f738a6ca0d0b938fea5cb7baaeae7d72e243614468a2" -dependencies = [ - "futures-core", - "pin-project-lite", + "windows-sys 0.42.0", ] [[package]] @@ -315,67 +249,78 @@ dependencies = [ ] [[package]] -name = "async-stream" -version = "0.3.5" +name = "async-task" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] -name = "async-stream-impl" -version = "0.3.5" +name = "async-trait" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.12", ] [[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-trait" -version = "0.1.73" +name = "atk" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", + "atk-sys", + "bitflags", + "glib", + "libc", ] [[package]] -name = "async_cell" -version = "0.2.2" +name = "atk-sys" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834eee9ce518130a3b4d5af09ecc43e9d6b57ee76613f227a1ddd6b77c7a62bc" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", +] [[package]] -name = "atomic" -version = "0.5.3" +name = "atomic-waker" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] -name = "atomic-waker" -version = "1.1.1" +name = "attohttpc" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" +dependencies = [ + "flate2", + "http", + "log", + "native-tls", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] [[package]] -name = "atomic_refcell" -version = "0.1.10" +name = "atty" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] [[package]] name = "autocfg" @@ -384,154 +329,197 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "backoff" -version = "0.4.0" +name = "base64" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "basic-cookies" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38" dependencies = [ - "futures-core", - "getrandom", - "instant", - "pin-project-lite", - "rand", - "tokio", + "lalrpop", + "lalrpop-util", + "regex", ] [[package]] -name = "backtrace" -version = "0.3.68" +name = "bit-set" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", + "bit-vec", ] [[package]] -name = "base64" -version = "0.21.2" +name = "bit-vec" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "base64ct" -version = "1.6.0" +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "bindgen" -version = "0.64.0" +name = "block-buffer" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", + "generic-array", ] [[package]] -name = "bit_field" -version = "0.10.2" +name = "blocking" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", +] [[package]] -name = "bitflags" -version = "1.3.2" +name = "bollard-stubs" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" +dependencies = [ + "chrono", + "serde", + "serde_with 1.14.0", +] [[package]] -name = "bitflags" -version = "2.4.0" +name = "borsh" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "40f9ca3698b2e4cb7c15571db0abc5551dca417a21ae8140460b50309bb2cc62" +dependencies = [ + "borsh-derive", + "hashbrown 0.13.2", +] [[package]] -name = "bitmaps" -version = "3.2.0" +name = "borsh-derive" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" +checksum = "598b3eacc6db9c3ee57b22707ad8f6a8d2f6d442bfe24ffeb8cbb70ca59e6a35" +dependencies = [ + "borsh-derive-internal", + "borsh-schema-derive-internal", + "proc-macro-crate 0.1.5", + "proc-macro2", + "syn 1.0.109", +] [[package]] -name = "blake3" -version = "1.4.1" +name = "borsh-derive-internal" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "186b734fa1c9f6743e90c95d7233c9faab6360d1a96d4ffa19d9cfd1e9350f8a" dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", - "digest", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "block" -version = "0.1.6" +name = "borsh-schema-derive-internal" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +checksum = "99b7ff1008316626f485991b960ade129253d4034014616b94f309a15366cc49" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] -name = "block-buffer" -version = "0.10.4" +name = "brotli" +version = "3.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" dependencies = [ - "generic-array", + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", ] [[package]] -name = "block-padding" -version = "0.3.3" +name = "brotli-decompressor" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ - "generic-array", + "alloc-no-stdlib", + "alloc-stdlib", ] [[package]] -name = "blocking" -version = "1.3.1" +name = "bstr" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", + "memchr", + "serde", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "bytecheck" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f" +dependencies = [ + "bytecheck_derive", + "ptr_meta", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" [[package]] name = "byteorder" @@ -546,205 +534,188 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] -name = "bytesize" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - -[[package]] name = "cairo-rs" -version = "0.17.10" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.17.10" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 6.0.3", ] [[package]] -name = "cbc" -version = "0.1.2" +name = "cargo_toml" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +checksum = "7f83bc2e401ed041b7057345ebc488c005efa0341d5541ce7004d30458d0090b" dependencies = [ - "cipher 0.4.4", -] - -[[package]] -name = "cc" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "libc", + "serde", + "toml 0.7.3", ] [[package]] -name = "cexpr" -version = "0.6.0" +name = "castaway" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] +checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] -name = "cfg-expr" -version = "0.15.4" +name = "cc" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" -dependencies = [ - "smallvec", - "target-lexicon", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] -name = "cfg-if" -version = "1.0.0" +name = "cesu8" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] -name = "cfg-vis" -version = "0.3.0" +name = "cfb" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a2c3bf5fc10fe2ca157564fbe08a4cb2b0a7d2ff3fe2f9683e65d5e7c7859c" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", + "byteorder", + "fnv", + "uuid", ] [[package]] -name = "chacha20" -version = "0.8.2" +name = "cfg-expr" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "zeroize", + "smallvec", ] [[package]] -name = "chacha20poly1305" -version = "0.9.1" +name = "cfg-expr" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" dependencies = [ - "aead", - "chacha20", - "cipher 0.3.0", - "poly1305", - "zeroize", + "smallvec", ] [[package]] -name = "checked_int_cast" +name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", + "num-integer", "num-traits", - "time", + "serde", + "time 0.1.45", "wasm-bindgen", "winapi", ] [[package]] -name = "cipher" -version = "0.3.0" +name = "cmake" +version = "0.1.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" dependencies = [ - "generic-array", + "cc", ] [[package]] -name = "cipher" -version = "0.4.4" +name = "cocoa" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "crypto-common", - "inout", - "zeroize", + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", ] [[package]] -name = "clang-sys" -version = "1.6.1" +name = "cocoa-foundation" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ - "glob", + "bitflags", + "block", + "core-foundation", + "core-graphics-types", + "foreign-types", "libc", + "objc", ] [[package]] -name = "color_quant" -version = "1.1.0" +name = "codespan-reporting" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "crossbeam-utils", + "termcolor", + "unicode-width", ] [[package]] -name = "const-oid" -version = "0.9.5" +name = "color_quant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "const_panic" -version = "0.2.8" +name = "combine" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] [[package]] -name = "constant_time_eq" -version = "0.3.0" +name = "concurrent-queue" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] [[package]] -name = "cookie-factory" -version = "0.3.2" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" @@ -758,67 +729,68 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] -name = "cpufeatures" -version = "0.2.9" +name = "core-graphics" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types", "libc", ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "core-graphics-types" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "cfg-if", + "bitflags", + "core-foundation", + "foreign-types", + "libc", ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "cpufeatures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ - "cfg-if", - "crossbeam-utils", + "libc", ] [[package]] -name = "crossbeam-deque" -version = "0.8.3" +name = "crc32fast" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", ] [[package]] -name = "crossbeam-epoch" -version = "0.9.15" +name = "crossbeam-channel" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ - "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -836,206 +808,227 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", "typenum", ] [[package]] -name = "ctr" -version = "0.9.2" +name = "cssparser" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" dependencies = [ - "cipher 0.4.4", + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", ] [[package]] -name = "curve25519-dalek" -version = "4.0.0" -source = "git+https://github.com/dalek-cryptography/curve25519-dalek/?rev=e44d4b5903106dde0e5b28a2580061de7dfe8a9f#e44d4b5903106dde0e5b28a2580061de7dfe8a9f" +name = "cssparser-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "platforms", - "rustc_version", - "serde", - "subtle", - "zeroize", + "quote", + "syn 1.0.109", ] [[package]] -name = "curve25519-dalek-derive" -version = "0.1.0" -source = "git+https://github.com/dalek-cryptography/curve25519-dalek/?rev=e44d4b5903106dde0e5b28a2580061de7dfe8a9f#e44d4b5903106dde0e5b28a2580061de7dfe8a9f" +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", ] [[package]] -name = "darling" -version = "0.14.4" +name = "cty" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] -name = "darling_core" -version = "0.14.4" +name = "curl" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi", ] [[package]] -name = "darling_macro" -version = "0.14.4" +name = "curl-sys" +version = "0.4.60+curl-7.88.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f" dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi", ] [[package]] -name = "dashmap" -version = "5.5.0" +name = "cxx" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ - "cfg-if", - "hashbrown 0.14.0", - "lock_api", - "once_cell", - "parking_lot_core", + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", ] [[package]] -name = "deadpool" -version = "0.9.5" +name = "cxx-build" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ - "async-trait", - "deadpool-runtime", - "num_cpus", - "retain_mut", - "tokio", + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 1.0.109", ] [[package]] -name = "deadpool-runtime" -version = "0.1.2" +name = "cxxbridge-flags" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" -dependencies = [ - "tokio", -] +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] -name = "deadpool-sqlite" -version = "0.5.0" +name = "cxxbridge-macro" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026821eaacbce25ff0d54405e4421d71656fcae3e4a9323461280fcda6dbc7d" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ - "deadpool", - "deadpool-sync", - "rusqlite", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "deadpool-sync" -version = "0.1.0" +name = "darling" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1bea344b64b32537fde6e0f0179b1ede34d435636719dd40fe6a0f28218a61c" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "deadpool", + "darling_core 0.13.4", + "darling_macro 0.13.4", ] [[package]] -name = "der" -version = "0.7.8" +name = "darling" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "const-oid", - "der_derive", - "flagset", - "zeroize", + "darling_core 0.14.4", + "darling_macro 0.14.4", ] [[package]] -name = "der_derive" -version = "0.7.2" +name = "darling_core" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ + "fnv", + "ident_case", "proc-macro2", "quote", - "syn 2.0.28", + "strsim", + "syn 1.0.109", ] [[package]] -name = "derivative" -version = "2.2.0" +name = "darling_core" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ + "fnv", + "ident_case", "proc-macro2", "quote", + "strsim", "syn 1.0.109", ] [[package]] -name = "derive_builder" -version = "0.12.0" +name = "darling_macro" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "derive_builder_macro", + "darling_core 0.13.4", + "quote", + "syn 1.0.109", ] [[package]] -name = "derive_builder_core" -version = "0.12.0" +name = "darling_macro" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling", - "proc-macro2", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] [[package]] -name = "derive_builder_macro" -version = "0.12.0" +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "derive_builder_core", + "convert_case", + "proc-macro2", + "quote", + "rustc_version 0.4.0", "syn 1.0.109", ] [[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] name = "digest" -version = "0.10.7" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", @@ -1052,6 +1045,16 @@ dependencies = [ ] [[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" @@ -1060,101 +1063,130 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] -name = "displaydoc" -version = "0.2.4" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", + "libc", + "redox_users", + "winapi", ] [[package]] -name = "djb_hash" -version = "0.1.3" +name = "dispatch" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] -name = "ed25519" -version = "2.2.1" +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "dtoa-short" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" +checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" dependencies = [ - "pkcs8", - "serde", - "signature", + "dtoa", ] [[package]] -name = "ed25519-dalek" -version = "2.0.0-rc.3" -source = "git+https://github.com/dalek-cryptography/curve25519-dalek/?rev=e44d4b5903106dde0e5b28a2580061de7dfe8a9f#e44d4b5903106dde0e5b28a2580061de7dfe8a9f" +name = "duct" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core", - "serde", - "sha2", - "zeroize", + "libc", + "once_cell", + "os_pipe", + "shared_child", ] [[package]] +name = "dunce" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" + +[[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] -name = "encoding_rs" -version = "0.8.32" +name = "embed-resource" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" dependencies = [ - "cfg-if", + "cc", + "rustc_version 0.4.0", + "toml 0.7.3", + "vswhom", + "winreg 0.11.0", ] [[package]] -name = "enumflags2" -version = "0.7.7" +name = "embed_plist" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "ena" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e5d13ca2353ab7d0230988629def93914a8c4015f621f9b13ed2955614731d" dependencies = [ - "enumflags2_derive", - "serde", + "log", ] [[package]] -name = "enumflags2_derive" -version = "0.7.7" +name = "encoding_rs" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", + "cfg-if", ] [[package]] -name = "equivalent" -version = "1.0.1" +name = "env_logger" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] [[package]] name = "errno" -version = "0.3.2" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "winapi", ] [[package]] @@ -1174,57 +1206,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "exr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "eyeball" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a7b57c052e83f2bd8d756fc379132e43d3786f3767856026ee3757868f099f" -dependencies = [ - "futures-core", - "readlock", -] - -[[package]] -name = "eyeball-im" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d999ff633cd7243e8b9efc2a1e35846517f16ce4c3c87a70e0a829d8fb29af3" -dependencies = [ - "futures-core", - "imbl", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "eyeball-im-util" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a51602d13a284f2241af1d8dc020dd22f49a6bbbf420a5eccbea6c399069a45" -dependencies = [ - "eyeball-im", - "futures-core", - "imbl", - "pin-project-lite", -] - -[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1246,63 +1227,50 @@ dependencies = [ ] [[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" +name = "field-offset" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" dependencies = [ - "simd-adler32", + "memoffset", + "rustc_version 0.3.3", ] [[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "field-offset" -version = "0.3.6" +name = "filetime" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ - "memoffset 0.9.0", - "rustc_version", + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.45.0", ] [[package]] -name = "flagset" -version = "0.4.3" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", ] [[package]] -name = "flume" -version = "0.10.14" +name = "float-cmp" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin 0.9.8", + "num-traits", ] [[package]] @@ -1328,62 +1296,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ "percent-encoding", ] [[package]] -name = "fractal" -version = "5.0.0-beta2" -dependencies = [ - "ashpd", - "djb_hash", - "eyeball-im", - "futures-channel", - "futures-util", - "geo-uri", - "gettext-rs", - "gst-plugin-gtk4", - "gstreamer", - "gstreamer-base", - "gstreamer-pbutils", - "gstreamer-play", - "gstreamer-video", - "gtk4", - "html-escape", - "html2pango", - "html5gum", - "image 0.24.7", - "indexmap 2.0.0", - "libadwaita", - "libshumate", - "matrix-sdk", - "matrix-sdk-ui", - "mime", - "mime_guess", - "once_cell", - "oo7", - "pulldown-cmark", - "qrcode", - "rand", - "regex", - "rmp-serde", - "rqrr", - "ruma", - "secular", - "serde", - "serde_json", - "sourceview5", - "strum", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "url", -] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futf" @@ -1396,12 +1320,28 @@ dependencies = [ ] [[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]] @@ -1429,11 +1369,11 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", "memchr", @@ -1450,7 +1390,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.12", ] [[package]] @@ -1484,90 +1424,61 @@ dependencies = [ ] [[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "g2gen" -version = "1.0.1" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2c7625b2fc250dd90b63f7887a6bb0f7ec1d714c8278415bea2669ef20820e" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" dependencies = [ - "g2poly", - "proc-macro2", - "quote", - "syn 1.0.109", + "byteorder", ] [[package]] -name = "g2p" -version = "1.0.1" +name = "gdk" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc36d9bdc3d2da057775a9f4fa7d7b09edab3e0eda7a92cc353358fa63b8519e" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ - "g2gen", - "g2poly", + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", ] [[package]] -name = "g2poly" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" - -[[package]] name = "gdk-pixbuf" -version = "0.17.10" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.0.3", ] [[package]] -name = "gdk4" -version = "0.6.3" +name = "gdk-sys" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1577,214 +1488,112 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", -] - -[[package]] -name = "gdk4-wayland" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa73894ed86fe10157436123d8baae5f2924ebc4fa48a11d8f093e07b9ecbbd" -dependencies = [ - "gdk4", - "gdk4-wayland-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk4-wayland-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41c5a9cd7e06f612b91ec45ecb423ab57921bbd92f56e46a67b962be198e0c" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4-win32" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a79a5672b4b26ece3fc144c5be6c8d0ef2d84d37fed65002e5b1576fbc3ec00" -dependencies = [ - "gdk4", - "gdk4-win32-sys", - "gio", - "glib", - "libc", - "system-deps", + "system-deps 6.0.3", ] [[package]] -name = "gdk4-win32-sys" -version = "0.6.3" +name = "gdkx11-sys" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c1b84458185383da1d8877f812cccffd83a3cb42959d646e3e9a4ad0bc09ac" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" dependencies = [ - "gdk-pixbuf-sys", - "gdk4-sys", + "gdk-sys", "glib-sys", "libc", - "system-deps", -] - -[[package]] -name = "gdk4-x11" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17de2c3554d5127b9dfacd4d1801e2e3c9163bce01c6e1c407c054e9b771f2ee" -dependencies = [ - "gdk4", - "gdk4-x11-sys", - "gio", - "glib", - "libc", + "system-deps 6.0.3", + "x11", ] [[package]] -name = "gdk4-x11-sys" -version = "0.6.3" +name = "generator" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ca6c03d5019467d21671936edeba09f908039900af8ce4b834c19646031c72" +checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" dependencies = [ - "gdk4-sys", - "glib-sys", + "cc", "libc", - "system-deps", + "log", + "rustversion", + "windows 0.44.0", ] [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", ] [[package]] -name = "geo-uri" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6b8812a079cb4a3b5b366c2d05db8e231e2f231c443acb3532daad996d89f71" -dependencies = [ - "derive_builder", - "thiserror", -] - -[[package]] -name = "getopts" -version = "0.2.21" +name = "getrandom" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "unicode-width", + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", ] [[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] name = "gio" -version = "0.17.10" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ - "bitflags 1.3.2", + "bitflags", "futures-channel", "futures-core", "futures-io", - "futures-util", "gio-sys", "glib", "libc", "once_cell", - "pin-project-lite", - "smallvec", "thiserror", ] [[package]] name = "gio-sys" -version = "0.17.10" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.0.3", "winapi", ] [[package]] name = "glib" -version = "0.17.10" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ - "bitflags 1.3.2", + "bitflags", "futures-channel", "futures-core", "futures-executor", "futures-task", - "futures-util", - "gio-sys", "glib-macros", "glib-sys", "gobject-sys", "libc", - "memchr", "once_cell", "smallvec", "thiserror", @@ -1792,13 +1601,13 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" dependencies = [ "anyhow", - "heck", - "proc-macro-crate", + "heck 0.4.1", + "proc-macro-crate 1.3.0", "proc-macro-error", "proc-macro2", "quote", @@ -1807,12 +1616,12 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.17.10" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps", + "system-deps 6.0.3", ] [[package]] @@ -1822,371 +1631,90 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "gloo-timers" -version = "0.2.6" +name = "globset" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", ] [[package]] -name = "gloo-utils" -version = "0.1.7" +name = "gloo-timers" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ + "futures-channel", + "futures-core", "js-sys", - "serde", - "serde_json", "wasm-bindgen", - "web-sys", ] [[package]] name = "gobject-sys" -version = "0.17.10" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 6.0.3", ] [[package]] -name = "graphene-rs" -version = "0.17.10" +name = "gtk" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" -dependencies = [ - "bitflags 1.3.2", + "atk", + "bitflags", "cairo-rs", - "gdk4", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", "glib", - "graphene-rs", - "gsk4-sys", + "gtk-sys", + "gtk3-macros", "libc", + "once_cell", "pango", + "pkg-config", ] [[package]] -name = "gsk4-sys" -version = "0.6.3" +name = "gtk-sys" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" dependencies = [ + "atk-sys", "cairo-sys-rs", - "gdk4-sys", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", "glib-sys", "gobject-sys", - "graphene-sys", "libc", "pango-sys", - "system-deps", -] - -[[package]] -name = "gst-plugin-gtk4" -version = "0.10.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e0cc90b7251d84c6b256a41973c3255cd2b2267ab1b829d053f76bca7c6290" -dependencies = [ - "gdk4-win32", - "gst-plugin-version-helper", - "gstreamer", - "gstreamer-base", - "gstreamer-gl", - "gstreamer-video", - "gtk4", - "once_cell", - "windows-sys", -] - -[[package]] -name = "gst-plugin-version-helper" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87921209945e5dc809848a100115fad65bd127671896f0206f45e272080cc4c9" -dependencies = [ - "chrono", -] - -[[package]] -name = "gstreamer" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a4150420d4aa1caf6fa15f0dba7a5007d4116380633bd1253acce206098fc9" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "futures-channel", - "futures-core", - "futures-util", - "glib", - "gstreamer-sys", - "libc", - "muldiv", - "num-integer", - "num-rational 0.4.1", - "once_cell", - "option-operations", - "paste", - "pretty-hex", - "smallvec", - "thiserror", -] - -[[package]] -name = "gstreamer-audio" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8448db43cee0270c6ca94e6771c92a4c3b14c51ac1e6605a5f2deef66f5516f1" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "glib", - "gstreamer", - "gstreamer-audio-sys", - "gstreamer-base", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-audio-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4001b779e4707b32acd6ec0960e327b926369c1a34f7c41d477ac42b2670e8" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-base" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0896c4acff303dd21d6a96a7ea4cc9339f7096230fe1433720c9f0bed203985" -dependencies = [ - "atomic_refcell", - "bitflags 1.3.2", - "cfg-if", - "glib", - "gstreamer", - "gstreamer-base-sys", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26114ed96f6668380f5a1554128159e98e06c3a7a8460f216d7cd6dce28f928c" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82b83d18ad1c4d890694b4bedde170c748462a11f51a68428671bc1bf93e71e" -dependencies = [ - "bitflags 1.3.2", - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-gl-sys", - "gstreamer-video", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-gl-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08af9ae5ca5aa01c4875346bb7e61310b75a9afc3607b52a6b73470be93bbc7" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-pbutils" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63dd523f9dd60329ccfabdd76813b4dfe5a3bbf9fc108d3aa015f012e87778c" -dependencies = [ - "bitflags 1.3.2", - "glib", - "gstreamer", - "gstreamer-audio", - "gstreamer-pbutils-sys", - "gstreamer-video", - "libc", - "thiserror", + "system-deps 6.0.3", ] [[package]] -name = "gstreamer-pbutils-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb4493d59f28023656686c7a3581ddbd510b309a861776586afcf9a52ed222b" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-audio-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-play" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f752a53171e330c7f56db24ca91d99b7958dc86395ebe91b117226d339b29306" -dependencies = [ - "bitflags 1.3.2", - "glib", - "gstreamer", - "gstreamer-play-sys", - "gstreamer-video", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-play-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b69030bd53c3e5988a1e13bdb55ae8d922f8e9c2b522bfa2442bc13906829fb" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56fe047adef7d47dbafa8bc1340fddb53c325e16574763063702fc94b5786d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-video" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69a9554795d3791b8467a30b35ed40ef279aa41c857e6f414ffd6a182a20225" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "futures-channel", - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-video-sys", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66ddb6112d438aac0004d2db6053a572f92b1c5e0e9d6ff6c71d9245f7f73e46" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "once_cell", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.6.6" +name = "gtk3-macros" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.0", "proc-macro-error", "proc-macro2", "quote", @@ -2194,29 +1722,10 @@ dependencies = [ ] [[package]] -name = "gtk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] name = "h2" -version = "0.3.20" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" dependencies = [ "bytes", "fnv", @@ -2224,7 +1733,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -2232,19 +1741,13 @@ dependencies = [ ] [[package]] -name = "half" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] - -[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] [[package]] name = "hashbrown" @@ -2252,26 +1755,25 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] [[package]] -name = "hashbrown" -version = "0.14.0" +name = "hashlink" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ - "ahash", - "allocator-api2", + "hashbrown 0.12.3", ] [[package]] -name = "hashlink" -version = "0.8.3" +name = "heck" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ - "hashbrown 0.14.0", + "unicode-segmentation", ] [[package]] @@ -2282,64 +1784,48 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.1.19" 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" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] [[package]] -name = "hkdf" -version = "0.12.3" +name = "hermit-abi" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ - "hmac", + "libc", ] [[package]] -name = "hmac" -version = "0.12.1" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] -name = "html-escape" -version = "0.2.13" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "html2pango" -version = "0.5.0" +name = "hmac" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22f189d26bf7cf4652dbe49da86f3a27628f745469365f1d2575ea8caf54eaf" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "ammonia", - "anyhow", - "html5ever", - "linkify", - "maplit", - "markup5ever_rcdom", - "once_cell", - "regex", + "digest", ] [[package]] name = "html5ever" -version = "0.26.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", @@ -2350,15 +1836,6 @@ dependencies = [ ] [[package]] -name = "html5gum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4e556171a058ba117bbe88b059fb37b6289023e007d2903ea6dca3a3cbff14" -dependencies = [ - "jetscii", -] - -[[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2366,7 +1843,7 @@ checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.5", ] [[package]] @@ -2381,6 +1858,12 @@ dependencies = [ ] [[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" @@ -2393,10 +1876,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] +name = "httpmock" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6b56b6265f15908780cbee987912c1e98dbca675361f748291605a8a3a1df09" +dependencies = [ + "assert-json-diff", + "async-object-pool", + "async-trait", + "base64 0.13.1", + "basic-cookies", + "crossbeam-utils", + "form_urlencoded", + "futures-util", + "hyper", + "isahc", + "lazy_static", + "levenshtein", + "log", + "regex", + "serde", + "serde_json", + "serde_regex", + "similar", + "tokio", + "url", +] + +[[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.27" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -2407,9 +1924,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", + "itoa 1.0.5", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2431,25 +1948,36 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "winapi", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ - "cc", + "cxx", + "cxx-build", +] + +[[package]] +name = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", ] [[package]] @@ -2460,145 +1988,166 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] -name = "image" -version = "0.23.14" +name = "ignore" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-iter", - "num-rational 0.3.2", - "num-traits", + "crossbeam-utils", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", ] [[package]] name = "image" -version = "0.24.7" +version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational 0.4.1", + "num-rational", "num-traits", - "png", - "qoi", - "tiff", ] [[package]] -name = "imbl" -version = "2.0.0" +name = "indexmap" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2806b69cd9f4664844027b64465eacb444c67c1db9c778e341adff0c25cdb0d" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ - "bitmaps", - "imbl-sized-chunks", - "rand_core", - "rand_xoshiro", + "autocfg", + "hashbrown 0.12.3", "serde", - "version_check", ] [[package]] -name = "imbl-sized-chunks" -version = "0.1.1" +name = "infer" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076" +checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" dependencies = [ - "bitmaps", + "cfb", ] [[package]] -name = "indexed_db_futures" -version = "0.3.0" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbcff6ae46750b15cc594bfd277b188cbddcfdc1817848f97f03f26f8625b9e" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", - "js-sys", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", ] [[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +name = "insulator2" +version = "0.0.0" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "apache-avro", + "async-trait", + "dirs", + "env_logger", + "futures", + "httpmock", + "log", + "mockall", + "num-bigint", + "once_cell", + "r2d2", + "r2d2_sqlite", + "rand 0.8.5", + "rdkafka", + "reqwest", + "rlimit", + "rusqlite", + "rust-keystore", + "rust_decimal", + "serde", + "serde_json", + "sys-locale", + "tauri", + "tauri-build", + "testcontainers", + "time 0.3.21", + "tokio", + "toml 0.7.3", + "url", + "uuid", ] [[package]] -name = "indexmap" -version = "2.0.0" +name = "io-lifetimes" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ - "equivalent", - "hashbrown 0.14.0", - "serde", + "libc", + "windows-sys 0.45.0", ] [[package]] -name = "inout" -version = "0.1.3" +name = "ipnet" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] -name = "instant" -version = "0.1.12" +name = "is-terminal" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "isahc" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" dependencies = [ - "hermit-abi", - "libc", - "windows-sys", + "async-channel", + "castaway", + "crossbeam-utils", + "curl", + "curl-sys", + "encoding_rs", + "event-listener", + "futures-lite", + "http", + "log", + "mime", + "once_cell", + "polling", + "slab", + "sluice", + "tracing", + "tracing-futures", + "url", + "waker-fn", ] [[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2608,80 +2157,102 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.11.0" +name = "itoa" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] -name = "jetscii" -version = "0.5.3" +name = "javascriptcore-rs" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags", + "glib", + "javascriptcore-rs-sys", +] [[package]] -name = "jpeg-decoder" -version = "0.3.0" +name = "javascriptcore-rs-sys" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" dependencies = [ - "rayon", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", ] [[package]] -name = "js-sys" -version = "0.3.64" +name = "jni" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ - "wasm-bindgen", + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", ] [[package]] -name = "js_int" -version = "0.2.2" +name = "jni-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ - "serde", + "wasm-bindgen", ] [[package]] -name = "js_option" -version = "0.1.1" +name = "json-patch" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" dependencies = [ "serde", + "serde_json", + "treediff 3.0.2", ] [[package]] -name = "konst" -version = "0.3.6" +name = "json-patch" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030400e39b2dff8beaa55986a17e0014ad657f569ca92426aafcb5e8e71faee7" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" dependencies = [ - "const_panic", - "konst_kernel", - "typewit", + "serde", + "serde_json", + "thiserror", + "treediff 4.0.2", ] [[package]] -name = "konst_kernel" -version = "0.3.6" +name = "kuchiki" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3376133edc39f027d551eb77b077c2865a0ef252b2e7d0dd6b6dc303db95d8b5" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ - "typewit", + "cssparser", + "html5ever", + "matches", + "selectors", ] [[package]] @@ -2694,181 +2265,137 @@ dependencies = [ ] [[package]] -name = "lazy_static" -version = "1.4.0" +name = "lalrpop" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" dependencies = [ - "spin 0.5.2", + "ascii-canvas", + "atty", + "bit-set", + "diff", + "ena", + "itertools", + "lalrpop-util", + "petgraph", + "pico-args", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", ] [[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libadwaita" -version = "0.3.1" +name = "lalrpop-util" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" +checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "once_cell", - "pango", + "regex", ] [[package]] -name = "libadwaita-sys" -version = "0.3.0" +name = "lazy_static" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libc" -version = "0.2.147" +name = "levenshtein" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] -name = "libm" -version = "0.2.7" +name = "libc" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] -name = "libshumate" -version = "0.3.0" +name = "libflate" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f835052474118c10cfa5583e2d531a262ad7ea0909ae1a8a4e94b5d6d472078" +checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libc", - "libshumate-sys", - "once_cell", + "adler32", + "crc32fast", + "libflate_lz77", ] [[package]] -name = "libshumate-sys" -version = "0.3.0" +name = "libflate_lz77" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ab625df72e11d45d52793e388b5052ab2af7945d8a4d469f427a568f9a29bb" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" dependencies = [ - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "system-deps", + "rle-decode-fast", ] [[package]] -name = "libspa" -version = "0.6.0" +name = "libnghttp2-sys" +version = "0.1.7+1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "667dfbb50c3d1f7ee1d33afdc04d1255923ece7642db3303046e7d63d997d77d" +checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" dependencies = [ - "bitflags 1.3.2", "cc", - "cookie-factory", - "errno", "libc", - "libspa-sys", - "nom", - "system-deps", ] [[package]] -name = "libspa-sys" -version = "0.6.0" +name = "libsqlite3-sys" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79cf5b88f52534df7ca88d451ae9628e22124e3cc5c60966465a7db479534c7a" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" dependencies = [ - "bindgen", "cc", - "system-deps", + "pkg-config", + "vcpkg", ] [[package]] -name = "libsqlite3-sys" -version = "0.25.2" +name = "libz-sys" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ + "cc", + "libc", "pkg-config", "vcpkg", ] [[package]] -name = "linkify" -version = "0.9.0" +name = "line-wrap" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" dependencies = [ - "memchr", + "safemem", ] [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "link-cplusplus" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -2876,20 +2403,27 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ + "cfg-if", "value-bag", ] [[package]] -name = "lru" -version = "0.9.0" +name = "loom" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" dependencies = [ - "hashbrown 0.13.2", + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", ] [[package]] @@ -2908,19 +2442,13 @@ dependencies = [ ] [[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] name = "markup5ever" -version = "0.11.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", - "phf 0.10.1", + "phf 0.8.0", "phf_codegen", "string_cache", "string_cache_codegen", @@ -2928,284 +2456,19 @@ dependencies = [ ] [[package]] -name = "markup5ever_rcdom" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] -name = "matrix-pickle" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18185b3f64cc8d44840dbf92d92aeb05c1ef97094f51a32c1afd36a4415d225" -dependencies = [ - "matrix-pickle-derive", - "thiserror", -] - -[[package]] -name = "matrix-pickle-derive" -version = "0.1.0" +name = "matches" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef08fbb48d0d5125d3885e422c426b5be84067c63ceb5d8b32f9130143f5b81" -dependencies = [ - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "matrix-sdk" -version = "0.6.2" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "anymap2", - "async-stream", - "async-trait", - "backoff", - "bytes", - "bytesize", - "cfg-vis", - "dashmap", - "event-listener", - "eyeball", - "eyeball-im", - "eyeball-im-util", - "futures-core", - "futures-util", - "gloo-timers", - "http", - "hyper", - "image 0.24.7", - "imbl", - "matrix-sdk-base", - "matrix-sdk-common", - "matrix-sdk-indexeddb", - "matrix-sdk-sqlite", - "mime", - "mime2ext", - "rand", - "reqwest", - "ruma", - "serde", - "serde_html_form", - "serde_json", - "tempfile", - "thiserror", - "tokio", - "tower", - "tracing", - "url", - "zeroize", -] - -[[package]] -name = "matrix-sdk-base" -version = "0.6.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "async-trait", - "bitflags 2.4.0", - "dashmap", - "eyeball", - "futures-util", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "once_cell", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "matrix-sdk-common" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "futures-core", - "futures-util", - "gloo-timers", - "instant", - "ruma", - "serde", - "serde_json", - "tokio", - "wasm-bindgen-futures", -] - -[[package]] -name = "matrix-sdk-crypto" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "aes", - "async-std", - "async-trait", - "atomic", - "base64", - "byteorder", - "cfg-if", - "ctr", - "dashmap", - "eyeball", - "futures-core", - "futures-util", - "hkdf", - "hmac", - "itertools 0.11.0", - "matrix-sdk-common", - "matrix-sdk-qrcode", - "pbkdf2 0.11.0", - "rand", - "rmp-serde", - "ruma", - "serde", - "serde_json", - "sha2", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "ulid", - "vodozemac", - "zeroize", -] - -[[package]] -name = "matrix-sdk-indexeddb" -version = "0.2.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "anyhow", - "async-trait", - "base64", - "getrandom", - "gloo-utils", - "indexed_db_futures", - "js-sys", - "matrix-sdk-base", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "matrix-sdk-qrcode" -version = "0.4.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "byteorder", - "qrcode", - "ruma-common", - "thiserror", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-sqlite" -version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "async-trait", - "deadpool-sqlite", - "itertools 0.11.0", - "matrix-sdk-base", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "rmp-serde", - "ruma", - "rusqlite", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-store-encryption" -version = "0.2.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "blake3", - "chacha20poly1305", - "displaydoc", - "getrandom", - "hmac", - "pbkdf2 0.11.0", - "rand", - "rmp-serde", - "serde", - "serde_json", - "sha2", - "thiserror", - "zeroize", -] - -[[package]] -name = "matrix-sdk-ui" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=4643bae28445e058080896a280083b32fd403146#4643bae28445e058080896a280083b32fd403146" -dependencies = [ - "async-once-cell", - "async-rx", - "async-std", - "async-stream", - "async-trait", - "async_cell", - "chrono", - "eyeball", - "eyeball-im", - "eyeball-im-util", - "futures-core", - "futures-util", - "fuzzy-matcher", - "imbl", - "indexmap 2.0.0", - "itertools 0.11.0", - "matrix-sdk", - "matrix-sdk-base", - "matrix-sdk-crypto", - "mime", - "once_cell", - "pin-project-lite", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "unicode-normalization", -] +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" @@ -3215,84 +2478,71 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] [[package]] name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime2ext" -version = "0.1.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" - -[[package]] -name = "mime_guess" -version = "2.0.4" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] -name = "minimal-lexical" +name = "minisign-verify" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", - "simd-adler32", ] [[package]] name = "mio" -version = "0.8.8" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] -name = "muldiv" -version = "1.0.1" +name = "mockall" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] [[package]] -name = "nanorand" -version = "0.7.0" +name = "mockall_derive" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ - "getrandom", + "cfg-if", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -3314,36 +2564,61 @@ dependencies = [ ] [[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] name = "new_debug_unreachable" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] -name = "nix" -version = "0.26.2" +name = "nodrop" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] -name = "nom" -version = "7.1.3" +name = "nom8" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" dependencies = [ "memchr", - "minimal-lexical", ] [[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3354,20 +2629,6 @@ dependencies = [ ] [[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 0.4.1", - "num-traits", -] - -[[package]] name = "num-bigint" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3379,33 +2640,6 @@ 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", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-complex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ - "num-traits", -] - -[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3416,10 +2650,10 @@ dependencies = [ ] [[package]] -name = "num-iter" -version = "0.1.43" +name = "num-rational" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -3427,45 +2661,43 @@ dependencies = [ ] [[package]] -name = "num-rational" -version = "0.3.2" +name = "num-traits" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "num-integer", - "num-traits", ] [[package]] -name = "num-rational" -version = "0.4.1" +name = "num_cpus" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", + "hermit-abi 0.2.6", + "libc", ] [[package]] -name = "num-traits" -version = "0.2.16" +name = "num_enum" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "autocfg", + "num_enum_derive", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "num_enum_derive" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "hermit-abi", - "libc", + "proc-macro-crate 1.3.0", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -3475,6 +2707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -3489,70 +2722,36 @@ dependencies = [ ] [[package]] -name = "objc_id" -version = "0.1.1" +name = "objc_exception" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" dependencies = [ - "objc", + "cc", ] [[package]] -name = "object" -version = "0.31.1" +name = "objc_id" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" dependencies = [ - "memchr", + "objc", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oo7" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccef508ad85be8bf619ea56ba0f99ebcef59d87d759e22fd3bf2d96649c897c" -dependencies = [ - "aes", - "byteorder", - "cbc", - "cipher 0.4.4", - "digest", - "dirs", - "futures-util", - "hkdf", - "hmac", - "num", - "num-bigint-dig", - "once_cell", - "pbkdf2 0.12.2", - "rand", - "serde", - "sha2", - "tokio", - "tracing", - "zbus", - "zeroize", -] - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -3563,13 +2762,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", ] [[package]] @@ -3579,13 +2778,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] +name = "openssl-src" +version = "111.25.0+1.1.1t" +source = "git+https://github.com/andrewinci/openssl-src-rs.git?branch=release/111#7c965abbe8d9375334a2e32b357a792a04283471" +dependencies = [ + "cc", +] + +[[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ + "autocfg", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -3597,22 +2806,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "option-operations" -version = "0.5.0" +name = "os_info" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" dependencies = [ - "paste", + "log", + "serde", + "winapi", ] [[package]] -name = "ordered-stream" -version = "0.2.0" +name = "os_pipe" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" dependencies = [ - "futures-core", - "pin-project-lite", + "libc", + "windows-sys 0.45.0", ] [[package]] @@ -3623,12 +2834,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.17.10" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ - "bitflags 1.3.2", - "gio", + "bitflags", "glib", "libc", "once_cell", @@ -3637,21 +2847,21 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.0.3", ] [[package]] name = "parking" -version = "2.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "parking_lot" @@ -3665,67 +2875,59 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets", + "windows-sys 0.45.0", ] [[package]] -name = "password-hash" -version = "0.4.2" +name = "paste" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] -name = "paste" -version = "1.0.14" +name = "percent-encoding" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] -name = "pbkdf2" -version = "0.11.0" +name = "pest" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", + "thiserror", + "ucd-trie", ] [[package]] -name = "pbkdf2" -version = "0.12.2" +name = "petgraph" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ - "digest", - "hmac", + "fixedbitset", + "indexmap", ] [[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.0" +name = "phf" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] [[package]] name = "phf" @@ -3733,27 +2935,29 @@ 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" -version = "0.11.2" +name = "phf_codegen" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_macros", - "phf_shared 0.11.2", + "phf_generator 0.8.0", + "phf_shared 0.8.0", ] [[package]] -name = "phf_codegen" -version = "0.10.0" +name = "phf_generator" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", + "phf_shared 0.8.0", + "rand 0.7.3", ] [[package]] @@ -3763,75 +2967,86 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared 0.10.0", - "rand", + "rand 0.8.5", ] [[package]] -name = "phf_generator" -version = "0.11.2" +name = "phf_macros" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" dependencies = [ - "phf_shared 0.11.2", - "rand", + "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.11.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ "siphasher", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ "siphasher", ] [[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] name = "pin-project" -version = "1.1.3" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -3840,105 +3055,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pipewire" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2180a4a84b855be86e6cd72fa6fd4318278871d2b1082e7cd05fe64b135ccb" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "errno", - "libc", - "libspa", - "libspa-sys", - "nix", - "once_cell", - "pipewire-sys", - "thiserror", -] - -[[package]] -name = "pipewire-sys" -version = "0.6.0" +name = "pkg-config" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95290eedb7fb6aa3922fdc0261cd0ddeb940abcdbdef28778928106554d2123" -dependencies = [ - "bindgen", - "libspa-sys", - "system-deps", -] +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] -name = "pkcs7" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79178be066405e0602bf3035946edef6b11b3f9dde46dfe5f8bfd7dea4b77e7" -dependencies = [ - "der", - "spki", - "x509-cert", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" +name = "plist" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +checksum = "9469799ca90293a376f68f6fcb8f11990d9cff55602cfba0ba83893c973a7f46" dependencies = [ - "der", - "spki", + "base64 0.21.0", + "indexmap", + "line-wrap", + "quick-xml", + "serde", + "time 0.3.21", ] [[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "platforms" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" - -[[package]] name = "png" -version = "0.17.9" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "bitflags 1.3.2", + "bitflags", "crc32fast", - "fdeflate", "flate2", "miniz_oxide", ] [[package]] name = "polling" -version = "2.8.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", - "bitflags 1.3.2", "cfg-if", - "concurrent-queue", "libc", "log", - "pin-project-lite", - "windows-sys", -] - -[[package]] -name = "poly1305" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", + "wepoll-ffi", + "windows-sys 0.42.0", ] [[package]] @@ -3954,19 +3113,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "pretty-hex" -version = "0.3.0" +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.18.1", ] [[package]] @@ -3994,75 +3186,97 @@ dependencies = [ ] [[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] [[package]] -name = "prost" -version = "0.11.9" +name = "ptr_meta" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "bytes", - "prost-derive", + "ptr_meta_derive", ] [[package]] -name = "prost-derive" -version = "0.11.9" +name = "ptr_meta_derive" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "anyhow", - "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", ] [[package]] -name = "pulldown-cmark" -version = "0.9.3" +name = "quad-rand" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88" + +[[package]] +name = "quick-xml" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" dependencies = [ - "bitflags 1.3.2", - "getopts", "memchr", - "unicase", ] [[package]] -name = "qoi" -version = "0.4.1" +name = "quote" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "bytemuck", + "proc-macro2", ] [[package]] -name = "qrcode" -version = "0.12.0" +name = "r2d2" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ - "checked_int_cast", - "image 0.23.14", + "log", + "parking_lot", + "scheduled-thread-pool", ] [[package]] -name = "quote" -version = "1.0.32" +name = "r2d2_sqlite" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "b4f5d0337e99cd5cacd91ffc326c6cc9d8078def459df560c4f9bf9ba4a51034" dependencies = [ - "proc-macro2", + "r2d2", + "rusqlite", +] + +[[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]] @@ -4072,8 +3286,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "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]] @@ -4083,7 +3307,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "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]] @@ -4092,62 +3325,74 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.8", ] [[package]] -name = "rand_xoshiro" -version = "0.6.0" +name = "rand_hc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core", + "rand_core 0.5.1", ] [[package]] -name = "rayon" -version = "1.7.0" +name = "rand_pcg" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "either", - "rayon-core", + "rand_core 0.5.1", ] [[package]] -name = "rayon-core" -version = "1.11.0" +name = "raw-window-handle" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", + "cty", ] [[package]] -name = "readlock" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2" +name = "rdkafka" +version = "0.29.0" +source = "git+https://github.com/andrewinci/rust-rdkafka.git#cb6b5a98ab85cd7119dc5f6814017b8adb170148" +dependencies = [ + "futures-channel", + "futures-util", + "libc", + "log", + "rdkafka-sys", + "serde", + "serde_derive", + "serde_json", + "slab", + "tokio", +] [[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +name = "rdkafka-sys" +version = "4.3.0+2.0.2" +source = "git+https://github.com/andrewinci/rust-rdkafka.git#cb6b5a98ab85cd7119dc5f6814017b8adb170148" dependencies = [ - "bitflags 1.3.2", + "cmake", + "libc", + "libz-sys", + "num_enum", + "openssl-sys", + "pkg-config", + "sasl2-sys", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -4156,21 +3401,20 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom", - "redox_syscall 0.2.16", + "getrandom 0.2.8", + "redox_syscall", "thiserror", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-syntax", ] [[package]] @@ -4179,18 +3423,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.4", + "regex-syntax", ] [[package]] @@ -4200,10 +3433,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "regex-syntax" -version = "0.7.4" +name = "remove_dir_all" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rend" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +dependencies = [ + "bytecheck", +] [[package]] name = "reqwest" @@ -4211,8 +3456,7 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "async-compression", - "base64", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -4235,271 +3479,241 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-socks", - "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] -name = "retain_mut" -version = "0.1.9" +name = "rfd" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" +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 = "rmp" -version = "0.8.12" +name = "rkyv" +version = "0.7.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "c30f1d45d9aa61cbc8cd1eb87705470892289bb2d01943e7803b873a57404dc3" dependencies = [ - "byteorder", - "num-traits", - "paste", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", ] [[package]] -name = "rmp-serde" -version = "1.1.2" +name = "rkyv_derive" +version = "0.7.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" dependencies = [ - "byteorder", - "rmp", - "serde", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "rqrr" -version = "0.6.0" +name = "rle-decode-fast" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8b87d1f9f69bb1a6c77e20fd303f9617b2b68dcff87cd9bcbfff2ced4b8a0b" -dependencies = [ - "g2p", - "image 0.24.7", - "lru", -] +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] -name = "ruma" -version = "0.8.2" -source = "git+https://github.com/ruma/ruma.git?rev=f1772ae5bc1d849655498f51b0fec7b0ef10e339#f1772ae5bc1d849655498f51b0fec7b0ef10e339" +name = "rlimit" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a29d87a652dc4d43c586328706bb5cdff211f3f39a530f240b53f7221dab8e" dependencies = [ - "assign", - "js_int", - "js_option", - "ruma-client-api", - "ruma-common", - "ruma-federation-api", - "ruma-push-gateway-api", + "libc", ] [[package]] -name = "ruma-client-api" -version = "0.16.2" -source = "git+https://github.com/ruma/ruma.git?rev=f1772ae5bc1d849655498f51b0fec7b0ef10e339#f1772ae5bc1d849655498f51b0fec7b0ef10e339" +name = "rusqlite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" dependencies = [ - "assign", - "bytes", - "http", - "js_int", - "js_option", - "maplit", - "ruma-common", - "serde", - "serde_html_form", - "serde_json", + "bitflags", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", ] [[package]] -name = "ruma-common" -version = "0.11.3" -source = "git+https://github.com/ruma/ruma.git?rev=f1772ae5bc1d849655498f51b0fec7b0ef10e339#f1772ae5bc1d849655498f51b0fec7b0ef10e339" +name = "rust-keystore" +version = "0.1.1" +source = "git+https://github.com/andrewinci/rust-keystore?tag=v0.1.2#fbbf2ba943bb778b1c06f5e1cc9ceb889d724ed3" dependencies = [ - "base64", - "bytes", - "form_urlencoded", - "getrandom", - "html5ever", - "http", - "indexmap 2.0.0", - "js-sys", - "js_int", - "js_option", - "konst", - "percent-encoding", - "phf 0.11.2", - "pulldown-cmark", - "rand", - "regex", - "ruma-identifiers-validation", - "ruma-macros", - "serde", - "serde_html_form", - "serde_json", - "thiserror", - "tracing", - "url", - "uuid", - "wildmatch", + "base64 0.13.1", + "openssl", + "sha1", + "simple_asn1", ] [[package]] -name = "ruma-federation-api" -version = "0.7.1" -source = "git+https://github.com/ruma/ruma.git?rev=f1772ae5bc1d849655498f51b0fec7b0ef10e339#f1772ae5bc1d849655498f51b0fec7b0ef10e339" +name = "rust_decimal" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc" dependencies = [ - "js_int", - "ruma-common", + "arrayvec", + "borsh", + "bytecheck", + "byteorder", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", "serde", "serde_json", ] [[package]] -name = "ruma-identifiers-validation" -version = "0.9.1" -source = "git+https://github.com/ruma/ruma.git?rev=f1772ae5bc1d849655498f51b0fec7b0ef10e339#f1772ae5bc1d849655498f51b0fec7b0ef10e339" +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "js_int", - "thiserror", + "semver 0.11.0", ] [[package]] -name = "ruma-macros" -version = "0.11.3" -source = "git+https://github.com/ruma/ruma.git?rev=f1772ae5bc1d849655498f51b0fec7b0ef10e339#f1772ae5bc1d849655498f51b0fec7b0ef10e339" +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "ruma-identifiers-validation", - "serde", - "syn 2.0.28", - "toml", + "semver 1.0.16", ] [[package]] -name = "ruma-push-gateway-api" -version = "0.7.1" -source = "git+https://github.com/ruma/ruma.git?rev=f1772ae5bc1d849655498f51b0fec7b0ef10e339#f1772ae5bc1d849655498f51b0fec7b0ef10e339" +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ - "js_int", - "ruma-common", - "serde", - "serde_json", + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", ] [[package]] -name = "rusqlite" -version = "0.28.0" +name = "rustversion" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" -dependencies = [ - "bitflags 1.3.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] -name = "rustc-demangle" -version = "0.1.23" +name = "ryu" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "safemem" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] -name = "rustc_version" -version = "0.4.0" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "semver", + "winapi-util", ] [[package]] -name = "rustix" -version = "0.37.23" +name = "sasl2-sys" +version = "0.1.20+2.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "9e645bd98535fc8fd251c43ba7c7c1f9be1e0369c99b6a5ea719052a773e655c" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", + "cc", + "duct", "libc", - "linux-raw-sys 0.3.8", - "windows-sys", + "pkg-config", ] [[package]] -name = "rustix" -version = "0.38.8" +name = "schannel" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.5", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] -name = "rustversion" -version = "1.0.14" +name = "scheduled-thread-pool" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +dependencies = [ + "parking_lot", +] [[package]] -name = "ryu" -version = "1.0.15" +name = "scoped-tls" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] -name = "schannel" -version = "0.1.22" +name = "scopeguard" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys", -] +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "scopeguard" -version = "1.2.0" +name = "scratch" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] -name = "secular" -version = "1.0.1" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3dc3eccdf599b53eba8a34a1190bd47394948258d1c43dca9cceb2426e25bb5" -dependencies = [ - "unicode-normalization", -] +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -4508,89 +3722,118 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", ] [[package]] -name = "semver" -version = "1.0.18" +name = "selectors" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] [[package]] -name = "serde" -version = "1.0.183" +name = "semver" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "serde_derive", + "semver-parser", ] [[package]] -name = "serde_bytes" -version = "0.11.12" +name = "semver" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" 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_derive" -version = "1.0.183" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.12", ] [[package]] -name = "serde_html_form" -version = "0.2.2" +name = "serde_json" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ - "form_urlencoded", - "indexmap 2.0.0", - "itoa", + "itoa 1.0.5", "ryu", "serde", ] [[package]] -name = "serde_json" -version = "1.0.104" +name = "serde_regex" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" dependencies = [ - "itoa", - "ryu", + "regex", "serde", ] [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" dependencies = [ "serde", ] @@ -4602,12 +3845,94 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.5", "ryu", "serde", ] [[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros 1.5.2", +] + +[[package]] +name = "serde_with" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap", + "serde", + "serde_json", + "serde_with_macros 2.3.2", + "time 0.3.21", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling 0.13.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4620,9 +3945,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", @@ -4639,16 +3964,20 @@ dependencies = [ ] [[package]] -name = "shlex" -version = "1.1.0" +name = "shared_child" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] [[package]] name = "signal-hook" -version = "0.3.17" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -4664,16 +3993,22 @@ dependencies = [ ] [[package]] -name = "signature" -version = "2.1.0" +name = "similar" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] -name = "simd-adler32" -version = "0.3.7" +name = "simple_asn1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time 0.3.21", +] [[package]] name = "siphasher" @@ -4691,10 +4026,21 @@ dependencies = [ ] [[package]] +name = "sluice" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel", + "futures-core", + "futures-io", +] + +[[package]] name = "smallvec" -version = "1.11.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" @@ -4707,87 +4053,53 @@ dependencies = [ ] [[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "sourceview5" -version = "0.6.1" +name = "soup2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee960607b1f7fda934dce68e76e925989ebe186ac04d6ab5ea9ce93e13835c03" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "gdk-pixbuf", - "gdk4", + "bitflags", "gio", "glib", - "gtk4", "libc", - "pango", - "sourceview5-sys", + "once_cell", + "soup2-sys", ] [[package]] -name = "sourceview5-sys" -version = "0.6.0" +name = "soup2-sys" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a23462cd3d696199b56317d35e69b240d655b8c70c12bd8f443b672313776c" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ - "gdk-pixbuf-sys", - "gdk4-sys", + "bitflags", "gio-sys", "glib-sys", "gobject-sys", - "gtk4-sys", "libc", - "pango-sys", - "system-deps", + "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" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "spki" -version = "0.7.2" +name = "state" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" dependencies = [ - "base64ct", - "der", + "loom", ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "string_cache" -version = "0.8.7" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ "new_debug_unreachable", "once_cell", @@ -4820,9 +4132,6 @@ name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] [[package]] name = "strum_macros" @@ -4830,7 +4139,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", @@ -4839,9 +4148,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" @@ -4856,9 +4165,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" dependencies = [ "proc-macro2", "quote", @@ -4866,41 +4175,299 @@ dependencies = [ ] [[package]] +name = "sys-locale" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] name = "system-deps" -version = "6.1.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" dependencies = [ - "cfg-expr", - "heck", + "cfg-expr 0.9.1", + "heck 0.3.3", "pkg-config", - "toml", - "version-compare", + "toml 0.5.11", + "version-compare 0.0.11", ] [[package]] -name = "target-lexicon" -version = "0.12.11" +name = "system-deps" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +dependencies = [ + "cfg-expr 0.11.0", + "heck 0.4.1", + "pkg-config", + "toml 0.5.11", + "version-compare 0.1.1", +] [[package]] -name = "temp-dir" -version = "0.1.11" +name = "tao" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" +dependencies = [ + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "paste", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tauri" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412" +dependencies = [ + "anyhow", + "attohttpc", + "base64 0.13.1", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.1", + "http", + "ignore", + "minisign-verify", + "objc", + "once_cell", + "os_info", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "rfd", + "semver 1.0.16", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time 0.3.21", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "929b3bd1248afc07b63e33a6a53c3f82c32d0b0a5e216e4530e94c467e019389" +dependencies = [ + "anyhow", + "cargo_toml", + "heck 0.4.1", + "json-patch 1.0.0", + "semver 1.0.16", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "winnow", +] + +[[package]] +name = "tauri-codegen" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +dependencies = [ + "base64 0.13.1", + "brotli", + "ico", + "json-patch 0.2.7", + "plist", + "png", + "proc-macro2", + "quote", + "semver 1.0.16", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time 0.3.21", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-runtime" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c" +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.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab" +dependencies = [ + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6f9c2dafef5cbcf52926af57ce9561bd33bb41d7394f8bb849c0330260d864" +dependencies = [ + "brotli", + "ctor", + "glob", + "heck 0.4.1", + "html5ever", + "infer", + "json-patch 1.0.0", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver 1.0.16", + "serde", + "serde_json", + "serde_with 2.3.2", + "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.3", +] [[package]] name = "tempfile" -version = "3.7.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.8", - "windows-sys", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", ] [[package]] @@ -4915,23 +4482,72 @@ dependencies = [ ] [[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "termtree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" + +[[package]] +name = "testcontainers" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87" +dependencies = [ + "bollard-stubs", + "futures", + "hex", + "hmac", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "sha2", +] + +[[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.44" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.12", ] [[package]] @@ -4945,17 +4561,6 @@ dependencies = [ ] [[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.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4967,6 +4572,42 @@ dependencies = [ ] [[package]] +name = "time" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +dependencies = [ + "itoa 1.0.5", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +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 = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4983,21 +4624,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.30.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ - "backtrace", + "autocfg", "bytes", "libc", "mio", "num_cpus", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2", "tokio-macros", - "tracing", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5008,7 +4649,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.12", ] [[package]] @@ -5022,34 +4663,10 @@ dependencies = [ ] [[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "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", - "tokio-util", -] - -[[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -5061,57 +4678,63 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", ] [[package]] -name = "toml_datetime" -version = "0.6.3" +name = "toml" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", + "serde_spanned", + "toml_datetime 0.6.1", + "toml_edit 0.19.8", ] [[package]] -name = "toml_edit" -version = "0.19.14" +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" + +[[package]] +name = "toml_datetime" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ - "indexmap 2.0.0", "serde", - "serde_spanned", - "toml_datetime", - "winnow", ] [[package]] -name = "tower" -version = "0.4.13" +name = "toml_edit" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", + "indexmap", + "nom8", + "toml_datetime 0.5.1", ] [[package]] -name = "tower-layer" -version = "0.3.2" +name = "toml_edit" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime 0.6.1", + "winnow", +] [[package]] name = "tower-service" @@ -5134,26 +4757,36 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", ] [[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.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5166,9 +4799,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ "matchers", "nu-ansi-term", @@ -5183,62 +4816,63 @@ dependencies = [ ] [[package]] -name = "try-lock" -version = "0.2.4" +name = "treediff" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +dependencies = [ + "serde_json", +] [[package]] -name = "typenum" -version = "1.16.0" +name = "treediff" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +dependencies = [ + "serde_json", +] [[package]] -name = "typewit" -version = "1.5.0" +name = "try-lock" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5cee357cc77d1e02f10a3e6c4e13b8462fafab05998b62d331b7d9485589ff" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] -name = "uds_windows" -version = "1.0.2" +name = "typed-builder" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "64cba322cb9b7bc6ca048de49e83918223f35e7a86311267013afff257004870" dependencies = [ - "tempfile", - "winapi", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "ulid" -version = "1.0.0" +name = "typenum" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" -dependencies = [ - "rand", -] +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] -name = "unicase" -version = "2.6.0" +name = "ucd-trie" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -5250,26 +4884,28 @@ dependencies = [ ] [[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 = "universal-hash" -version = "0.4.0" +name = "unicode-xid" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" -dependencies = [ - "generic-array", - "subtle", -] +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" -version = "2.4.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", @@ -5284,19 +4920,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "utf8-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - -[[package]] name = "uuid" -version = "1.4.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ - "getrandom", - "wasm-bindgen", + "getrandom 0.2.8", + "serde", ] [[package]] @@ -5307,9 +4937,13 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.0.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "version_check", +] [[package]] name = "vcpkg" @@ -5319,6 +4953,12 @@ 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" @@ -5330,31 +4970,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "vodozemac" -version = "0.4.0" -source = "git+https://github.com/matrix-org/vodozemac/?rev=e3b658526f6f1dd0a9065c1c96346b796712c425#e3b658526f6f1dd0a9065c1c96346b796712c425" +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" dependencies = [ - "aes", - "arrayvec", - "base64", - "cbc", - "curve25519-dalek", - "ed25519-dalek", - "getrandom", - "hkdf", - "hmac", - "matrix-pickle", - "pkcs7", - "prost", - "rand", - "serde", - "serde_bytes", - "serde_json", - "sha2", - "subtle", - "thiserror", - "x25519-dalek", - "zeroize", + "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]] @@ -5364,16 +4996,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] name = "want" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +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.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" @@ -5386,9 +5036,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5396,24 +5046,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -5423,9 +5073,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5433,57 +5083,126 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] -name = "wasm-streams" -version = "0.2.3" +name = "web-sys" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ - "futures-util", "js-sys", "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", ] [[package]] -name = "web-sys" -version = "0.3.64" +name = "webkit2gtk" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ - "js-sys", - "wasm-bindgen", + "bitflags", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", ] [[package]] -name = "weezl" -version = "0.1.7" +name = "webkit2gtk-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.0.3", +] [[package]] -name = "wildmatch" -version = "2.1.1" +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 = "wepoll-ffi" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] [[package]] name = "winapi" @@ -5502,6 +5221,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5509,11 +5237,88 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +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.1", +] + +[[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-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 = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows-targets", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[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.1", ] [[package]] @@ -5522,25 +5327,52 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.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-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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] name = "windows_aarch64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5548,226 +5380,260 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[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.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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[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.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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[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.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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[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.48.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] -name = "windows_x86_64_msvc" +name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] -name = "winnow" -version = "0.5.10" +name = "windows_x86_64_msvc" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d" -dependencies = [ - "memchr", -] +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" [[package]] -name = "winreg" -version = "0.10.1" +name = "windows_x86_64_msvc" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" [[package]] -name = "x25519-dalek" -version = "2.0.0-rc.3" -source = "git+https://github.com/dalek-cryptography/curve25519-dalek/?rev=e44d4b5903106dde0e5b28a2580061de7dfe8a9f#e44d4b5903106dde0e5b28a2580061de7dfe8a9f" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - -[[package]] -name = "x509-cert" -version = "0.2.4" +name = "windows_x86_64_msvc" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25eefca1d99701da3a57feb07e5079fc62abba059fc139e98c13bbb250f3ef29" -dependencies = [ - "const-oid", - "der", - "spki", -] +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] -name = "xdg-home" -version = "1.0.0" +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix", - "winapi", -] +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] -name = "xml5ever" -version = "0.17.0" +name = "winnow" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ - "log", - "mac", - "markup5ever", + "memchr", ] [[package]] -name = "zbus" -version = "3.14.1" +name = "winreg" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "async-broadcast", - "async-process", - "async-recursion", - "async-trait", - "byteorder", - "derivative", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", ] [[package]] -name = "zbus_macros" -version = "3.14.1" +name = "winreg" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", + "cfg-if", + "winapi", ] [[package]] -name = "zbus_names" -version = "2.6.0" +name = "wry" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" dependencies = [ + "base64 0.13.1", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", "serde", - "static_assertions", - "zvariant", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", ] [[package]] -name = "zeroize" -version = "1.6.0" +name = "x11" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" dependencies = [ - "zeroize_derive", + "libc", + "pkg-config", ] [[package]] -name = "zeroize_derive" -version = "1.4.2" +name = "x11-dl" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", + "libc", + "once_cell", + "pkg-config", ] [[package]] -name = "zune-inflate" -version = "0.2.54" +name = "xattr" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ - "simd-adler32", + "libc", ] [[package]] -name = "zvariant" -version = "3.15.0" +name = "zerocopy" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236" dependencies = [ "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "url", - "zvariant_derive", + "zerocopy-derive", ] [[package]] -name = "zvariant_derive" -version = "3.15.0" +name = "zerocopy-derive" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" dependencies = [ - "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", - "zvariant_utils", ] [[package]] -name = "zvariant_utils" -version = "1.0.1" +name = "zip" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "byteorder", + "crc32fast", + "crossbeam-utils", ] diff --git a/nixpkgs/pkgs/applications/misc/insulator2/default.nix b/nixpkgs/pkgs/applications/misc/insulator2/default.nix new file mode 100644 index 000000000000..456ca5d2448e --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/insulator2/default.nix @@ -0,0 +1,99 @@ +{ lib +, cmake +, dbus +, fetchFromGitHub +, fetchYarnDeps +, openssl +, pkg-config +, freetype +, libsoup +, gtk3 +, webkitgtk +, perl +, cyrus_sasl +, stdenv +, fixup_yarn_lock +, yarn +, nodejs-slim +, cargo-tauri +, cargo +, rustPlatform +, rustc +}: + +stdenv.mkDerivation rec { + pname = "insulator2"; + version = "2.12.2"; + + src = fetchFromGitHub { + owner = "andrewinci"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Bi9GCQr7yox5Plc7o0svRKYi1XoK/HDGj1VbW1z4jac="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-ih5NSOvYje981SkVfPHm/u2sS1B36kgxpfe9LmQaxdo="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "apache-avro-0.15.0" = "sha256-bjA/x/IDzAYugsc1vn9fBVKaCiLOJYdA1Q9H2pffBh0="; + "openssl-src-111.25.0+1.1.1t" = "sha256-1BEtb38ilJJAw35KW+NOIe1rhxxOPsnz0gA2zJnof8c="; + "rdkafka-0.29.0" = "sha256-a739Fc+qjmIrK754GT22Gb/Ftd82lLSUzv53Ej7Khu4="; + "rust-keystore-0.1.1" = "sha256-Cj64uJFZNxnrplhRuqf9/HK/RAaawzfYHo/J9snZ+TU="; + }; + }; + + configurePhase = '' + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + yarn run postinstall --offline + ''; + + preBuild = '' + yarn tauri build -b deb + ''; + + cargoRoot = "backend/"; + + preInstall = '' + mv backend/target/release/bundle/deb/*/data/usr/ "$out" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + perl + rustPlatform.cargoSetupHook + cargo + rustc + cargo-tauri + fixup_yarn_lock + yarn + nodejs-slim + cyrus_sasl + ]; + + buildInputs = [ + dbus + openssl.out + freetype + libsoup + gtk3 + webkitgtk + ]; + + meta = with lib; { + description = "A client UI to inspect Kafka topics, consume, produce and much more"; + homepage = "https://github.com/andrewinci/insulator2"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tc-kaluza ]; + }; + +} diff --git a/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix b/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix index b3800d6c7e11..a5255eee366b 100644 --- a/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.1.0.18144"; + version = "2.1.1.18388"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-K65naW+RWAy4uxQq2GQmL0kwCH+G73ez1kgTtnTwjEw="; + sha256 = "sha256-E3pvuzZtK09jGwqkxwzkTUfgzsJMEUyd0Id5VbZdMlY="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/misc/keepass-diff/default.nix b/nixpkgs/pkgs/applications/misc/keepass-diff/default.nix index 3f88c00b4f5a..5e03c0f2cac4 100644 --- a/nixpkgs/pkgs/applications/misc/keepass-diff/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass-diff/default.nix @@ -1,17 +1,15 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "keepass-diff"; - version = "1.1.3"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "Narigo"; - repo = pname; - rev = version; - sha256 = "sha256-jd/cUkTHylLwzxolQUzMlXHauCfXUhcUr/1zKpdngbo="; + src = fetchCrate { + inherit pname version; + hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4="; }; - cargoSha256 = "sha256-2e2lGG72HmX7AFk0+J3U62Kch5ylrqvaIpitRF546JA="; + cargoHash = "sha256-+kgb9hbCH4Nt80nobTeDrC+LVp1r6EbzUs+t6zlIhtU="; meta = with lib; { description = "A CLI-tool to diff Keepass (.kdbx) files"; diff --git a/nixpkgs/pkgs/applications/misc/keepass/default.nix b/nixpkgs/pkgs/applications/misc/keepass/default.nix deleted file mode 100644 index b16ff896b6fa..000000000000 --- a/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, - unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }: -let - inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; -in buildDotnetPackage rec { - pname = "keepass"; - version = "2.55"; - - src = fetchurl { - url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc="; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ icoutils ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - xsel = "${xsel}/bin/xsel"; - xprop = "${xorg.xprop}/bin/xprop"; - xdotool = "${xdotool}/bin/xdotool"; - uname = "${coreutils}/bin/uname"; - whereis = "${unixtools.whereis}/bin/whereis"; - gsettings = "${glib}/bin/gsettings"; - }) - ]; - - # KeePass looks for plugins in under directory in which KeePass.exe is - # located. It follows symlinks where looking for that directory, so - # buildEnv is not enough to bring KeePass and plugins together. - # - # This derivation patches KeePass to search for plugins in specified - # plugin derivations in the Nix store and nowhere else. - pluginLoadPathsPatch = - let outputLc = toString (add 7 (length plugins)); - patchTemplate = readFile ./keepass-plugins.patch; - loadTemplate = readFile ./keepass-plugins-load.patch; - loads = - lib.concatStrings - (map - (p: replaceStrings ["$PATH$"] [ (unsafeDiscardStringContext (toString p)) ] loadTemplate) - plugins); - in replaceStrings ["$OUTPUT_LC$" "$DO_LOADS$"] [outputLc loads] patchTemplate; - - passAsFile = [ "pluginLoadPathsPatch" ]; - postPatch = '' - sed -i 's/\r*$//' KeePass/Forms/MainForm.cs - patch -p1 <$pluginLoadPathsPatchPath - ''; - - preConfigure = '' - rm -rvf Build/* - find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \; - find . -name "*.csproj" -print -exec sed -i ' - s#ToolsVersion="3.5"#ToolsVersion="4.0"#g - s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g - s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g - s#<SignAssembly>.*$#<SignAssembly>false</SignAssembly>#g - s#<PostBuildEvent>.*sgen.exe.*$## - ' {} \; - ''; - - desktopItem = makeDesktopItem { - name = "keepass"; - exec = "keepass"; - comment = "Password manager"; - icon = "keepass"; - desktopName = "Keepass"; - genericName = "Password manager"; - categories = [ "Utility" ]; - mimeTypes = [ "application/x-keepass2" ]; - }; - - outputFiles = [ - "Build/KeePass/Release/*" - "Build/KeePassLib/Release/*" - "Ext/KeePass.config.xml" # contains <PreferUserConfiguration>true</PreferUserConfiguration> - ]; - dllFiles = [ "KeePassLib.dll" ]; - exeFiles = [ "KeePass.exe" ]; - - # plgx plugin like keefox requires mono to compile at runtime - # after loading. It is brought into plugins bin/ directory using - # buildEnv in the plugin derivation. Wrapper below makes sure it - # is found and does not pollute output path. - binPaths = lib.concatStringsSep ":" (map (x: x + "/bin") plugins); - - dynlibPath = lib.makeLibraryPath [ gtk2 ]; - - postInstall = - let - extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; - in - '' - mkdir -p "$out/share/applications" - cp ${desktopItem}/share/applications/* $out/share/applications - wrapProgram $out/bin/keepass \ - --prefix PATH : "$binPaths" \ - --prefix LD_LIBRARY_PATH : "$dynlibPath" - - ${extractFDeskIcons} \ - "./Translation/TrlUtil/Resources/KeePass.ico" \ - '[^\.]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' \ - '\1' \ - '([^\.]+).+' \ - 'keepass' \ - "$out" \ - "./tmp" - ''; - - meta = { - description = "GUI password manager with strong cryptography"; - homepage = "http://www.keepass.info/"; - maintainers = with lib.maintainers; [ amorsillo obadz ]; - platforms = with lib.platforms; all; - license = lib.licenses.gpl2; - mainProgram = "keepass"; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/nixpkgs/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh deleted file mode 100755 index dec7367379e4..000000000000 --- a/nixpkgs/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -# The file from which to extract *.ico files. -#rscFile="./KeePass.exe" -rscFile=$1 - -# A regexp that can extract the image size from the file name. -# sizeRegex='[^\.]+\.exe_[0-9]+_[0-9]+_[0-9]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' -sizeRegex=$2 - -# sizeReplaceExp='\1' -sizeReplaceExp=$3 - -# A regexp that can extract the name of the target image from the file name. -# nameRegex='([^\.]+)\.exe.+' -nameRegex=$4 - -# nameReplaceExp='\1' -nameReplaceExp=$5 - -# out=./myOut -out=$6 - -# An optional temp dir. TODO: Generate it randomly by default instead. -tmp=./tmp -if [ "" != "$4" ]; then - tmp=$7 -fi - - - -rm -rf $tmp/png $tmp/ico -mkdir -p $tmp/png $tmp/ico - -# Extract the ressource file's extension. -rscFileExt=`echo "$rscFile" | sed -re 's/.+\.(.+)$/\1/'` - -# Debug ressource file extension. -echo "rscFileExt=$rscFileExt" - -if [ "ico" = "$rscFileExt" ]; then - cp -p $rscFile $tmp/ico -else - wrestool -x --output=$tmp/ico -t14 $rscFile -fi - -icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico - -mkdir -p $out - -for i in $tmp/png/*.png; do - fn=`basename "$i"` - size=$(echo $fn | sed -re 's/'${sizeRegex}'/'${sizeReplaceExp}'/') - name=$(echo $fn | sed -re 's/'${nameRegex}'/'${nameReplaceExp}'/') - targetDir=$out/share/icons/hicolor/$size/apps - targetFile=$targetDir/$name.png - mkdir -p $targetDir - mv $i $targetFile -done - -rm -rf $tmp/png $tmp/ico diff --git a/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch b/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch deleted file mode 100644 index b574716b0f2a..000000000000 --- a/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 830d0db80f2fce09e12c117f8338b8e4b05866ff Mon Sep 17 00:00:00 2001 -From: Pascal Winkelmann <pascal@wnklmnn.de> -Date: Tue, 19 May 2020 10:28:31 +0200 -Subject: [PATCH] fixpaths - ---- - KeePass/Native/NativeMethods.Unix.cs | 2 +- - KeePass/UI/UISystemFonts.cs | 2 +- - KeePass/Util/AppLocator.cs | 2 +- - KeePass/Util/ClipboardUtil.Unix.cs | 14 +++++++------- - KeePassLib/Native/ClipboardU.cs | 2 +- - KeePassLib/Native/NativeLib.cs | 2 +- - KeePassLib/Utility/MonoWorkarounds.cs | 4 ++-- - 7 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs -index 4c47258..79cfdb2 100644 ---- a/KeePass/Native/NativeMethods.Unix.cs -+++ b/KeePass/Native/NativeMethods.Unix.cs -@@ -130,7 +130,7 @@ namespace KeePass.Native - try - { - Application.DoEvents(); // E.g. for clipboard updates -- string strOutput = NativeLib.RunConsoleApp("xdotool", strParams); -+ string strOutput = NativeLib.RunConsoleApp("@xdotool@", strParams); - Application.DoEvents(); // E.g. for clipboard updates - return (strOutput ?? string.Empty); - } -diff --git a/KeePass/UI/UISystemFonts.cs b/KeePass/UI/UISystemFonts.cs -index 08d6134..2bfa4a2 100644 ---- a/KeePass/UI/UISystemFonts.cs -+++ b/KeePass/UI/UISystemFonts.cs -@@ -188,7 +188,7 @@ namespace KeePass.UI - - private static void UbuntuLoadFonts() - { -- string strDef = NativeLib.RunConsoleApp("gsettings", -+ string strDef = NativeLib.RunConsoleApp("@gsettings@", - "get org.gnome.desktop.interface font-name"); - if(strDef == null) return; - -diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs -index af02803..8a32c9d 100644 ---- a/KeePass/Util/AppLocator.cs -+++ b/KeePass/Util/AppLocator.cs -@@ -468,7 +468,7 @@ namespace KeePass.Util - if(NativeLib.GetPlatformID() == PlatformID.MacOSX) - strOpt = string.Empty; // FR 3535696 - -- string str = NativeLib.RunConsoleApp("whereis", strOpt + strApp); -+ string str = NativeLib.RunConsoleApp("@whereis@", strOpt + strApp); - if(string.IsNullOrEmpty(str)) return null; - - int iSep = str.IndexOf(':'); -diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs ---- a/KeePass/Util/ClipboardUtil.Unix.cs -+++ b/KeePass/Util/ClipboardUtil.Unix.cs -@@ -65,7 +65,7 @@ - // "-out -selection clipboard"); - // if(str != null) return str; - -- string str = NativeLib.RunConsoleApp("xsel", -+ string str = NativeLib.RunConsoleApp("@xsel@", - "--output --clipboard", null, XSelFlags); - if(str != null) return str; - } -@@ -93,10 +93,10 @@ - if(string.IsNullOrEmpty(str)) - { - // xsel with an empty input can hang, thus use --clear -- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", -+ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", - null, XSelFlags) != null) - { -- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", -+ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", - null, XSelFlags); - return; - } -@@ -107,10 +107,10 @@ - } - - // xsel does not support --primary and --clipboard together -- if(NativeLib.RunConsoleApp("xsel", "--input --primary", -+ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", - str, XSelFlags) != null) - { -- NativeLib.RunConsoleApp("xsel", "--input --clipboard", -+ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", - str, XSelFlags); - return; - } -diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs -index 291c51d..3c76380 100644 ---- a/KeePassLib/Native/ClipboardU.cs -+++ b/KeePassLib/Native/ClipboardU.cs -@@ -27,7 +27,7 @@ namespace KeePassLib.Native - { - internal static class ClipboardU - { -- internal const string XSel = "xsel"; -+ internal const string XSel = "@xsel@"; - private const string XSelV = "--version"; - private const string XSelR = "--output --clipboard"; - private const string XSelC = "--clear --clipboard"; -diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs -index 2d227a3..243f4ee 100644 ---- a/KeePassLib/Native/NativeLib.cs -+++ b/KeePassLib/Native/NativeLib.cs -@@ -143,7 +143,7 @@ namespace KeePassLib.Native - // Mono returns PlatformID.Unix on MacOS, workaround this - if(g_platID.Value == PlatformID.Unix) - { -- if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( -+ if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( - "Darwin", StrUtil.CaseIgnoreCmp)) - g_platID = PlatformID.MacOSX; - } -diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs -index e20bb3a..4fd875b 100644 ---- a/KeePassLib/Utility/MonoWorkarounds.cs -+++ b/KeePassLib/Utility/MonoWorkarounds.cs -@@ -41,7 +41,7 @@ namespace KeePassLib.Utility - { - public static class MonoWorkarounds - { -- private const string AppXDoTool = "xdotool"; -+ private const string AppXDoTool = "@xdotool@"; - - private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>(); - private static Thread g_thFixClip = null; -@@ -356,7 +356,7 @@ namespace KeePassLib.Utility - // } - // else { Debug.Assert(false); } - -- string strWmClass = (NativeLib.RunConsoleApp("xprop", -+ string strWmClass = (NativeLib.RunConsoleApp("@xprop@", - "-id " + strHandle + " WM_CLASS") ?? string.Empty); - - if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"", --- -2.25.4 - diff --git a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch deleted file mode 100644 index e6a6bff8dad3..000000000000 --- a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ /dev/null @@ -1 +0,0 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", System.IO.SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch b/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch deleted file mode 100644 index 978387eb9919..000000000000 --- a/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4cb0b18f5326a07927453897180289a4b254ac4f Mon Sep 17 00:00:00 2001 -From: Pascal Winkelmann <pascal@wnklmnn.de> -Date: Tue, 19 May 2020 10:43:49 +0200 -Subject: [PATCH] loadplugin - ---- - KeePass/Forms/MainForm.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs -index 347eaf5..b92e1e2 100644 ---- a/KeePass/Forms/MainForm_Functions.cs -+++ b/KeePass/Forms/MainForm_Functions.cs -@@ -312,7 +312,$OUTPUT_LC$ @@ namespace KeePass.Forms - ToolStripItemCollection tsicT = m_ctxTray.Items; - ToolStripItem tsiPrevT = m_ctxTrayOptions; - -- m_pluginManager.LoadAllPlugins(); -$DO_LOADS$+ - - m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); - m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); --- -2.25.4 - diff --git a/nixpkgs/pkgs/applications/misc/khal/default.nix b/nixpkgs/pkgs/applications/misc/khal/default.nix index a8de9a4ddec8..27bf5d1db267 100644 --- a/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -86,6 +86,5 @@ python3.pkgs.buildPythonApplication rec { homepage = "http://lostpackets.de/khal/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; - broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/applications/misc/khard/default.nix b/nixpkgs/pkgs/applications/misc/khard/default.nix index ff1bb3aa2e90..bc779fb9b65f 100644 --- a/nixpkgs/pkgs/applications/misc/khard/default.nix +++ b/nixpkgs/pkgs/applications/misc/khard/default.nix @@ -1,12 +1,12 @@ { lib, python3, fetchPypi, khard, testers }: python3.pkgs.buildPythonApplication rec { - version = "0.18.0"; + version = "0.19.0"; pname = "khard"; src = fetchPypi { inherit pname version; - sha256 = "05860fdayqap128l7i6bcmi9kdyi2gx02g2pmh88d56xgysd927y"; + sha256 = "sha256-5ki+adfz7m0+FbxC9+IXHLn8oeLKLkASuU15lyDATKQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/applications/misc/liberasurecode/default.nix b/nixpkgs/pkgs/applications/misc/liberasurecode/default.nix index 289423c61220..f94496d0b125 100644 --- a/nixpkgs/pkgs/applications/misc/liberasurecode/default.nix +++ b/nixpkgs/pkgs/applications/misc/liberasurecode/default.nix @@ -23,13 +23,19 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace doc/doxygen.cfg.in \ --replace "GENERATE_MAN = NO" "GENERATE_MAN = YES" + + substituteInPlace Makefile.am src/Makefile.am \ + --replace "-Werror" "" ''; nativeBuildInputs = [ autoreconfHook doxygen installShellFiles ]; buildInputs = [ zlib ]; - configureFlags = [ "--enable-doxygen" ]; + configureFlags = [ + "--disable-werror" + "--enable-doxygen" + ]; postInstall = '' # remove useless man pages about directories diff --git a/nixpkgs/pkgs/applications/misc/llpp/default.nix b/nixpkgs/pkgs/applications/misc/llpp/default.nix index d7db123ef4e3..03c1702b2073 100644 --- a/nixpkgs/pkgs/applications/misc/llpp/default.nix +++ b/nixpkgs/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,26 @@ -{ stdenv, lib, substituteAll, makeWrapper, fetchFromGitHub, fetchpatch, ocaml, pkg-config, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, -libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps, darwin }: +{ stdenv +, lib +, makeWrapper +, fetchFromGitHub +, ocaml +, pkg-config +, mupdf +, libX11 +, jbig2dec +, openjpeg +, libjpeg +, lcms2 +, harfbuzz +, libGLU +, libGL +, gumbo +, freetype +, zlib +, xclip +, inotify-tools +, procps +, darwin +}: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; @@ -27,11 +48,6 @@ stdenv.mkDerivation rec { dontStrip = true; - configurePhase = '' - mkdir -p build/mupdf/thirdparty - ln -s ${freetype.dev} build/mupdf/thirdparty/freetype - ''; - buildPhase = '' bash ./build.bash build ''; @@ -51,10 +67,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://repo.or.cz/w/llpp.git"; + homepage = "https://github.com/criticic/llpp"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; + license = [ licenses.publicDomain licenses.bsd3 ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/mako/default.nix b/nixpkgs/pkgs/applications/misc/mako/default.nix index ffad5a5684fa..b4eeb51049be 100644 --- a/nixpkgs/pkgs/applications/misc/mako/default.nix +++ b/nixpkgs/pkgs/applications/misc/mako/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ dywedir synthetica ]; platforms = platforms.linux; + mainProgram = "mako"; }; } diff --git a/nixpkgs/pkgs/applications/misc/mission-center/default.nix b/nixpkgs/pkgs/applications/misc/mission-center/default.nix index 8384fc1ce456..acbf4c053c4a 100644 --- a/nixpkgs/pkgs/applications/misc/mission-center/default.nix +++ b/nixpkgs/pkgs/applications/misc/mission-center/default.nix @@ -104,6 +104,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' + substituteInPlace src/main.rs \ + --replace "libGL.so.1" "${libGL}/lib/libGL.so.1" + SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop diff --git a/nixpkgs/pkgs/applications/misc/nhentai/default.nix b/nixpkgs/pkgs/applications/misc/nhentai/default.nix index 9f99c4fa62d6..1f9fdcf48ccb 100644 --- a/nixpkgs/pkgs/applications/misc/nhentai/default.nix +++ b/nixpkgs/pkgs/applications/misc/nhentai/default.nix @@ -6,6 +6,7 @@ python3Packages.buildPythonApplication rec { pname = "nhentai"; version = "0.5.3"; + src = fetchFromGitHub { owner = "RicterZ"; repo = pname; @@ -18,6 +19,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ requests + img2pdf iso8601 beautifulsoup4 soupsieve @@ -25,10 +27,11 @@ python3Packages.buildPythonApplication rec { future ]; - meta = with lib; { + meta = { homepage = "https://github.com/RicterZ/nhentai"; description = "nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + mainProgram = "nhentai"; }; } diff --git a/nixpkgs/pkgs/applications/misc/nwg-look/default.nix b/nixpkgs/pkgs/applications/misc/nwg-look/default.nix index 864e94d4e07f..a9aceb33c391 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-look/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-look/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "nwg-look"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-look"; rev = "v${version}"; - hash = "sha256-wUI58qYkVYgES87HQ4octciDlOJ10oJldbUkFgxRUd4="; + hash = "sha256-Gw0C5PCVwXuwXWF39P7pc8KdnmCYRH24zizShmniynM="; }; - vendorHash = "sha256-dev+TV6FITd29EfknwHDNI0gLao7gsC95Mg+3qQs93E="; + vendorHash = "sha256-vHqnIkzsoQHiP6mmrwNetq6Pp5UB1CmX7mYvgsbvb0s="; # Replace /usr/ directories with the packages output location # This means it references the correct path diff --git a/nixpkgs/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix index e825d803947a..cbdc8e64aa9d 100644 --- a/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "44.1"; + version = "45.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9e1lUdcviXshJI1DMIWnuBesy7ApaoTD6FHZH7Lu5N4="; + sha256 = "v8wGv0vEe70CwVaNHkZL8Wox5iv3A7SaoTsI2zihqMo="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch b/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch index 037b323c8cb1..45ae4b827ba5 100644 --- a/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch +++ b/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/orca/debug.py b/src/orca/debug.py -index e79482ed4..cbf3a24ec 100644 +index b7e11ea60..9ab996765 100644 --- a/src/orca/debug.py +++ b/src/orca/debug.py -@@ -502,7 +502,7 @@ def traceit(frame, event, arg): +@@ -447,7 +447,7 @@ def traceit(frame, event, arg): return traceit def getOpenFDCount(pid): @@ -11,29 +11,20 @@ index e79482ed4..cbf3a24ec 100644 procs = procs.decode('UTF-8').split('\n') files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) -@@ -510,7 +510,7 @@ def getOpenFDCount(pid): - - def getCmdline(pid): - try: -- openFile = os.popen('cat /proc/%s/cmdline' % pid) -+ openFile = os.popen('@cat@ /proc/%s/cmdline' % pid) - cmdline = openFile.read() - openFile.close() - except: -@@ -520,7 +520,7 @@ def getCmdline(pid): +@@ -465,7 +465,7 @@ def getCmdline(pid): return cmdline def pidOf(procName): -- openFile = subprocess.Popen('pgrep %s' % procName, -+ openFile = subprocess.Popen('@pgrep@ %s' % procName, +- openFile = subprocess.Popen(f'pgrep {procName}', ++ openFile = subprocess.Popen(f'@pgrep@ {procName}', shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() diff --git a/src/orca/orca.py b/src/orca/orca.py -index 2fe0a0bf2..087526556 100644 +index d4e89f918..bb3e6cc1d 100644 --- a/src/orca/orca.py +++ b/src/orca/orca.py -@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent): +@@ -312,7 +312,7 @@ def updateKeyMap(keyboardEvent): def _setXmodmap(xkbmap): """Set the keyboard map using xkbcomp.""" @@ -42,7 +33,7 @@ index 2fe0a0bf2..087526556 100644 stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(xkbmap) -@@ -363,7 +363,7 @@ def _storeXmodmap(keyList): +@@ -389,7 +389,7 @@ def _storeXmodmap(keyList): """ global _originalXmodmap @@ -51,7 +42,7 @@ index 2fe0a0bf2..087526556 100644 def _restoreXmodmap(keyList=[]): """Restore the original xmodmap values for the keys in keyList. -@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]): +@@ -404,7 +404,7 @@ def _restoreXmodmap(keyList=[]): global _capsLockCleared _capsLockCleared = False @@ -61,19 +52,19 @@ index 2fe0a0bf2..087526556 100644 p.communicate(_originalXmodmap) diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index 8c9d40153..eec0d5437 100644 +index 9d64af948..ca9c9e083 100644 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -62,7 +62,7 @@ class ListApps(argparse.Action): +@@ -65,7 +65,7 @@ class ListApps(argparse.Action): name = "[DEAD]" try: - cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid) + cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid) - except: + except Exception: cmdline = '(exception encountered)' else: -@@ -197,7 +197,7 @@ def inGraphicalDesktop(): +@@ -198,7 +198,7 @@ def inGraphicalDesktop(): def otherOrcas(): """Returns the pid of any other instances of Orca owned by this user.""" @@ -82,3 +73,16 @@ index 8c9d40153..eec0d5437 100644 shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() +diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py +index ed8b155e4..0436cca42 100644 +--- a/src/orca/script_utilities.py ++++ b/src/orca/script_utilities.py +@@ -144,7 +144,7 @@ class Utilities: + return "" + + try: +- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline") ++ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline") + except Exception: + return "" + diff --git a/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index e5bd2f46aba5..b70e34e73d3b 100644 --- a/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -9,6 +9,7 @@ , rsync , wrapQtAppsHook , qtbase +, qtpositioning , qtsvg , libGLU , libGL @@ -28,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2023.08.18-8"; + version = "2023.11.17-17"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-vdleO4jNKibyDlqrfZsOCScpQ9zreuYSw2BSoNpmeLY="; + hash = "sha256-3oGcupO49+ZXyW+ii4T+wov4qweDnLO+VkXSAIh7qJ4="; fetchSubmodules = true; }; @@ -65,6 +66,7 @@ in stdenv.mkDerivation rec { # Most dependencies are vendored buildInputs = [ qtbase + qtpositioning qtsvg libGLU libGL diff --git a/nixpkgs/pkgs/applications/misc/oxker/default.nix b/nixpkgs/pkgs/applications/misc/oxker/default.nix index 2e22cdbd1b3a..5d10c7156364 100644 --- a/nixpkgs/pkgs/applications/misc/oxker/default.nix +++ b/nixpkgs/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.3.3"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2zdsVItGZYQydpC9E/uCbzOE9Xoh7zTqa9DpxA5qNCc="; + sha256 = "sha256-zre4ccMmv1NWcokLvEFRIf+kornAnge/a3c3b6IO03o="; }; - cargoHash = "sha256-FXYFQpiK2BGUz9GjsUPS9LWPeezbBQ3A33juoVCl71g="; + cargoHash = "sha256-xdfaTVRt5h4q0kfAE1l6pOXCfk0Cb8TnKNMZeeGvciY="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/nixpkgs/pkgs/applications/misc/p2pool/default.nix index a7b9041a34e2..f19092599009 100644 --- a/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-e/QXwRVtgl9+BaKbkeztCPfXORhef1HaKBPzKvVPVpM="; + sha256 = "sha256-3CzQVK/1kLL50UdlTsDvHVfx9ZY8B3M0qzcIlonII6k="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/misc/pagefind/default.nix b/nixpkgs/pkgs/applications/misc/pagefind/default.nix index 1b7505dc3651..06f62da1ffb6 100644 --- a/nixpkgs/pkgs/applications/misc/pagefind/default.nix +++ b/nixpkgs/pkgs/applications/misc/pagefind/default.nix @@ -24,21 +24,21 @@ in rustPlatform.buildRustPackage rec { pname = "pagefind"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "cloudcannon"; repo = "pagefind"; rev = "refs/tags/v${version}"; - hash = "sha256-vQbLaZug3gySMIbMdNqU7XcL4GZ7XqZ3ZkwdDBC5T9o="; + hash = "sha256-IN+l5Wq89tjppE0xCcvczQSkJc1CLymEFeieJhvQQ54="; }; - cargoHash = "sha256-ubuzO/67HguWPqd3y/IapO07L2pg2Q4vo1yTpEthdoU="; + cargoHash = "sha256-T7DBuqfpqaEmu9iItnFYsJVnEFxG1r9uXEkfqJp1mD8="; env.npmDeps_web_js = fetchNpmDeps { name = "npm-deps-web-js"; src = "${src}/pagefind_web_js"; - hash = "sha256-pGE4lUFZ4dA++8kBklcMBoaN/1Z92dfOzQKhukbuEyc="; + hash = "sha256-1gdVBCxxLEGFihIxoSSgxw/tMyVgwe7HFG/JjEfYVnQ="; }; env.npmDeps_ui_default = fetchNpmDeps { name = "npm-deps-ui-default"; diff --git a/nixpkgs/pkgs/applications/misc/parsec/bin.nix b/nixpkgs/pkgs/applications/misc/parsec/bin.nix index f631312b6faa..a52729d52c77 100644 --- a/nixpkgs/pkgs/applications/misc/parsec/bin.nix +++ b/nixpkgs/pkgs/applications/misc/parsec/bin.nix @@ -24,11 +24,11 @@ stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_86e"; + version = "150_90c"; src = fetchurl { - url = "https://web.archive.org/web/20230531105208/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; + url = "https://web.archive.org/web/20231028212419/https://builds.parsec.app/package/parsec-linux.deb"; + sha256 = "sha256-rFSdl7BgnuJAj6w5in0/yszO8b5qcr9b+wjF1WkAU70="; }; unpackPhase = '' @@ -104,7 +104,7 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - homepage = "https://parsecgaming.com/"; + homepage = "https://parsec.app/"; changelog = "https://parsec.app/changelog"; description = "Remote streaming service client"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/applications/misc/pastel/default.nix b/nixpkgs/pkgs/applications/misc/pastel/default.nix index 5e0f5fc9e011..ba59bc5db42c 100644 --- a/nixpkgs/pkgs/applications/misc/pastel/default.nix +++ b/nixpkgs/pkgs/applications/misc/pastel/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ davidtwco ]; + mainProgram = "pastel"; }; } diff --git a/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index 917476023cf7..e5d831513f06 100644 --- a/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk19, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.0.3"; + version = "5.2.0"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k="; + hash = "sha256-Q1387Su6bmBkXvcrTgWtYZb9z/pKHiOTfUkUNHN8ItY="; }; unpackPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; preFixup = '' - gappsWrapperArgs+=(--set JAVA_HOME "${jdk19}" --set PDFSAM_JAVA_PATH "${jdk19}") + gappsWrapperArgs+=(--set JAVA_HOME "${jdk21}" --set PDFSAM_JAVA_PATH "${jdk21}") ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock index 25cc0ccf41af..d7dfb99d1002 100644 --- a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock @@ -630,6 +630,15 @@ dependencies = [ ] [[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" @@ -698,6 +707,12 @@ dependencies = [ ] [[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + +[[package]] name = "const-oid" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -791,6 +806,18 @@ dependencies = [ ] [[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.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1138,6 +1165,15 @@ dependencies = [ ] [[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" @@ -1171,6 +1207,18 @@ 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" @@ -1389,6 +1437,12 @@ dependencies = [ ] [[package]] +name = "float-ord" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" + +[[package]] name = "flume" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1406,6 +1460,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "font-kit" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" +dependencies = [ + "bitflags 1.3.2", + "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" @@ -1467,6 +1546,27 @@ dependencies = [ ] [[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" @@ -2595,6 +2695,7 @@ dependencies = [ "include_dir", "itertools 0.10.5", "lingua-arabic-language-model", + "lingua-bokmal-language-model", "lingua-chinese-language-model", "lingua-english-language-model", "lingua-french-language-model", @@ -2606,6 +2707,8 @@ dependencies = [ "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", @@ -2634,6 +2737,15 @@ dependencies = [ ] [[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" @@ -2733,6 +2845,24 @@ dependencies = [ ] [[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" @@ -3533,6 +3663,25 @@ 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" @@ -3777,6 +3926,7 @@ dependencies = [ "arboard", "base64 0.21.4", "dirs 5.0.1", + "font-kit", "image", "libloader", "libloading 0.8.1", @@ -4331,12 +4481,13 @@ dependencies = [ [[package]] name = "selection" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09de39c8f10d37a7b9c2a9cb224dbe4535525cbe17ccf37c21419123ab54a197" +checksum = "ae9d5f752403a8ef95d55c47c297541c3c12e90bf8bdaf82287527ff9f373cb6" dependencies = [ "arboard", "enigo", + "log", "windows 0.44.0", "wl-clipboard-rs", "x11-clipboard", @@ -6618,6 +6769,15 @@ dependencies = [ ] [[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.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6762,6 +6922,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] +name = "yeslogic-fontconfig-sys" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386" +dependencies = [ + "const-cstr", + "dlib", + "once_cell", + "pkg-config", +] + +[[package]] name = "zbus" version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/applications/misc/pot/default.nix b/nixpkgs/pkgs/applications/misc/pot/default.nix index bf345bdea486..6162c964135e 100644 --- a/nixpkgs/pkgs/applications/misc/pot/default.nix +++ b/nixpkgs/pkgs/applications/misc/pot/default.nix @@ -19,17 +19,18 @@ , libsoup , openssl , xdotool +, cacert }: stdenv.mkDerivation rec { pname = "pot"; - version = "2.6.6"; + version = "2.7.0"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-ZpN+SgBq2vA2p4MjrT07j22VB67FdiXIIl9puGiGJA4="; + hash = "sha256-ODqMbyL6Zda/cY5Lgijaj9Pr5aozQDgzHlS89q4rA4w="; }; sourceRoot = "${src.name}/src-tauri"; @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { jq moreutils nodePackages.pnpm + cacert ]; installPhase = '' @@ -66,7 +68,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-PqdwoGPsu1j4sDTvBAguDhB2v1yaNWybluLiN37SDa4="; + outputHash = "sha256-xl1dSrJ7o0Xn4QB2tRBB6U8gUItltxTE+hyEJ1GIw1k="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 0c9907764f22..8114f2ecb416 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -32,6 +32,9 @@ , tbb_2021_8 , wxGTK32 , xorg +, libbgcode +, heatshrink +, catch2 , fetchpatch , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , wxGTK-override ? null @@ -68,7 +71,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.6.1"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "PrusaSlicer"; + hash = "sha256-S0z2v6knkQ+xlABB1zedEGtlxA/65X/vxLh304StfbE="; + rev = "version_${finalAttrs.version}"; + }; nativeBuildInputs = [ cmake @@ -102,6 +112,9 @@ stdenv.mkDerivation (finalAttrs: { tbb_2021_8 wxGTK-override' xorg.libX11 + libbgcode + heatshrink + catch2 ] ++ lib.optionals withSystemd [ systemd ]; @@ -143,21 +156,6 @@ stdenv.mkDerivation (finalAttrs: { --replace "#ifdef __APPLE__" "#if 0" ''; - patches = [ - # wxWidgets: CheckResizerFlags assert fix - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c.patch"; - hash = "sha256-MNGtaI7THu6HEl9dMwcO1hkrCtIkscoNh4ulA2cKtZA="; - }) - ]; - - src = fetchFromGitHub { - owner = "prusa3d"; - repo = "PrusaSlicer"; - hash = "sha256-t5lnBL7SZVfyR680ZK29YXgE3pag+uVv4+BGJZq40/A="; - rev = "version_${finalAttrs.version}"; - }; - cmakeFlags = [ "-DSLIC3R_STATIC=0" "-DSLIC3R_FHS=1" diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 308c0949f134..fc8e5cc7aa07 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -30,8 +30,8 @@ let inherit patches; }; beta = { - version = "2.5.59.2"; - sha256 = "sha256-IgE+NWy2DUrPR2ROfK1F67e8B3eoM9yRVQ0GZTxJ42I="; + version = "2.5.59.3"; + sha256 = "sha256-chHKEEMN0Dllebk7zQDg7mf2BU441RlSyXvXgiCmgA4="; inherit patches; }; }; diff --git a/nixpkgs/pkgs/applications/misc/pueue/default.nix b/nixpkgs/pkgs/applications/misc/pueue/default.nix index e644f44f5951..ff9e2013be2c 100644 --- a/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-EDd8SChQ8Vh2uNSZq5mrWdsLNT0KC4IMA7e3BPk6p04="; + hash = "sha256-m819IxJjUjRJvKRUdqwq/iOq6zznbM8/iZsplkAk0F0="; }; - cargoHash = "sha256-H4Oyn2cLyj/RNkiMQMzbHjhs1AJIcmSkZOO83ETByWk="; + cargoHash = "sha256-tUuo3vRnWNR5xlt9DbnHtfZqs0mGfMu4sZ7GrT1q6v4="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/applications/misc/qt-video-wlr/default.nix b/nixpkgs/pkgs/applications/misc/qt-video-wlr/default.nix index ffd22be085e1..f8020fbdb447 100644 --- a/nixpkgs/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/nixpkgs/pkgs/applications/misc/qt-video-wlr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }: +{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt }: let gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ gstreamer @@ -9,38 +9,39 @@ let ]; in stdenv.mkDerivation rec { pname = "qt-video-wlr"; - version = "2020-08-03"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "xdavidwu"; repo = "qt-video-wlr"; - rev = "f88a7aa43f28b879b18752069f4a1ec33d73f2fe"; - sha256 = "135kfyg1b61xvfpk8vpk4qyw6s9q1mn3a6lfkrqrhl0dz9kka9lx"; + rev = "1373c8eeb0a5d867927ba30a9a9bb2d5b0057a87"; + hash = "sha256-mg0ROD9kV88I5uCm+niAI5tJuhkmYC7Z8dixxrNow4c="; }; - nativeBuildInputs = [ pkg-config meson ninja wrapQtAppsHook ]; + nativeBuildInputs = [ + pkg-config + meson + cmake # only used for find layer-shell-qt + ninja + wrapQtAppsHook + ]; + buildInputs = [ - wayland - pixman - cairo - librsvg - wayland-protocols - wlroots - libxkbcommon - qtbase - qtmultimedia + qtbase + qtmultimedia + layer-shell-qt ]; qtWrapperArgs = [ - "--prefix PATH : $out/bin/qt-video-wlr" - "--prefix GST_PLUGIN_PATH : ${gstreamerPath}" + "--prefix PATH : $out/bin/qt-video-wlr" + "--prefix GST_PLUGIN_PATH : ${gstreamerPath}" ]; meta = with lib; { description = "Qt pip-mode-like video player for wlroots-based wayland compositors"; homepage = "https://github.com/xdavidwu/qt-video-wlr"; license = licenses.mit; - maintainers = with maintainers; [ fionera ]; + maintainers = with maintainers; [ fionera rewine ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/remnote/default.nix b/nixpkgs/pkgs/applications/misc/remnote/default.nix index 5ffc383f14f8..c564e42ec425 100644 --- a/nixpkgs/pkgs/applications/misc/remnote/default.nix +++ b/nixpkgs/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.12.64"; + version = "1.13.0"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-Pvz3bBpv4wN2NXxuKNNraCuOqvvtYOyg5PTSwMpL3cw="; + hash = "sha256-ovM7MnRqzy/mgz+h87hqIuvquODIfmxjdJG1NZYobbk="; }; appexec = appimageTools.wrapType2 { inherit pname version src; @@ -44,7 +44,7 @@ in meta = with lib; { description = "A note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; - maintainers = with maintainers; [ max-niederman jgarcia ]; + maintainers = with maintainers; [ max-niederman chewblacka ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; mainProgram = "remnote"; diff --git a/nixpkgs/pkgs/applications/misc/rivercarro/default.nix b/nixpkgs/pkgs/applications/misc/rivercarro/default.nix index 59537500878e..5962b49ffc6a 100644 --- a/nixpkgs/pkgs/applications/misc/rivercarro/default.nix +++ b/nixpkgs/pkgs/applications/misc/rivercarro/default.nix @@ -4,26 +4,28 @@ , pkg-config , river , wayland -, zig_0_9 +, wayland-protocols +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "rivercarro"; - version = "0.1.4"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~novakane"; repo = "rivercarro"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4="; + hash = "sha256-lucwn9MmyVd4pynuG/ZAXnZ384wdS0gi7JN44vNQA1I="; }; nativeBuildInputs = [ pkg-config river wayland - zig_0_9.hook + wayland-protocols + zig_0_11.hook ]; meta = with lib; { @@ -42,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kraem ]; - inherit (zig_0_9.meta) platforms; + inherit (zig_0_11.meta) platforms; }; }) diff --git a/nixpkgs/pkgs/applications/misc/seatd/default.nix b/nixpkgs/pkgs/applications/misc/seatd/default.nix index 7cc2c967fe01..da3dda9fc8d7 100644 --- a/nixpkgs/pkgs/applications/misc/seatd/default.nix +++ b/nixpkgs/pkgs/applications/misc/seatd/default.nix @@ -6,6 +6,7 @@ , scdoc , stdenv , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, nixosTests }: stdenv.mkDerivation (finalAttrs: { @@ -40,8 +41,10 @@ stdenv.mkDerivation (finalAttrs: { "-Dserver=enabled" ]; + passthru.tests.basic = nixosTests.seatd; + meta = { - description = "A universal seat management library"; + description = "A minimal seat management daemon, and a universal seat management library"; changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${finalAttrs.version}"; homepage = "https://sr.ht/~kennylevinsen/seatd/"; license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/applications/misc/shavee/default.nix b/nixpkgs/pkgs/applications/misc/shavee/default.nix index 10dc7507a00d..e419ccafeb0e 100644 --- a/nixpkgs/pkgs/applications/misc/shavee/default.nix +++ b/nixpkgs/pkgs/applications/misc/shavee/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "shavee"; - version = "0.5.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ashuio"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8="; }; - cargoHash = "sha256-iNGn5KknSNgazFSu6Nur7AkKVb6qKMxuFwTdCz5djWU="; + cargoHash = "sha256-tnIqhZpqdy8pV4L6KF5v19ufpWRpMX5gTPlWWbwB3RU="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/nixpkgs/pkgs/applications/misc/skytemple/default.nix index 43e41b253bf8..9ef5acb28fe1 100644 --- a/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -10,19 +10,20 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.5.5"; + version = "1.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7sv0TzYMQLEaohy45JPPiK2wS3x4sXaevT/BfHaSbWw="; + hash = "sha256-AQ8Wxks7TTHP2h9Tc1LYG4neQ2uWebFIFoCOd3A6KB8="; }; buildInputs = [ gtk3 gtksourceview4 - # webkitgkt is used for rendering interactive statistics graph which + # webkitgtk is used for rendering interactive statistics graph which # can be seen by opening a ROM, entering Pokemon section, selecting # any Pokemon, and clicking Stats and Moves tab. webkitgtk @@ -51,6 +52,7 @@ python3Packages.buildPythonApplication rec { skytemple-icons skytemple-ssb-debugger tilequant + wheel ] ++ skytemple-files.optional-dependencies.spritecollab; doCheck = false; # there are no tests diff --git a/nixpkgs/pkgs/applications/misc/snowmachine/default.nix b/nixpkgs/pkgs/applications/misc/snowmachine/default.nix deleted file mode 100644 index 022d75030d0a..000000000000 --- a/nixpkgs/pkgs/applications/misc/snowmachine/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ buildPythonPackage, lib, click, colorama, fetchPypi, setuptools-git }: - -buildPythonPackage rec { - pname = "snowmachine"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "1v385hhxy2a8vx5p0fhn0di8l4qfpb0a86j6nwsg0aw6ngb09qf1"; - }; - - buildInputs = [ setuptools-git ]; - propagatedBuildInputs = [ click colorama ]; - - doCheck = false; - pythonImportsCheck = [ "snowmachine" ]; - - meta = with lib; { - description = "A python script that will make your terminal snow"; - homepage = "https://github.com/sontek/snowmachine"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ djanatyn ]; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index 6d0b4ec0e1d7..7447f934c82e 100644 --- a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.27.1"; + version = "2.27.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-Z+paJAuzUnCdCSx2UHg1HV14vDo3jWsyUrcbEnvqTm0="; + hash = "sha256-TT7ZPvpiiDAvvN2ec/qN4i/6XCxfeBTPLD3dCxVTKBY="; }; vendorHash = "sha256-H2kSTsYiD9HResHes+7YxUyNcjtM0SLpDPUC0Y518VM="; diff --git a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 4f1a5fdef6b3..53eb0fca5ae2 100644 --- a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -33,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.8"; + version = "1.4.9"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Fy3cy6c36Qsi8F7cC/MI8g6tdfkn8fDBncL+ZOoiGcs="; + sha256 = "sha256-I9+q9GQ1QMbo7BdVG159iRYbDvRyfXmwBIW5AeJ3sC4="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix b/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix index dd6380449d95..d63c0874171e 100644 --- a/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs }: +{ stdenv, fetchYarnDeps, prefetch-yarn-deps, callPackage, nodejs }: let common = callPackage ./common.nix { }; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps nodejs nodejs.pkgs.yarn ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock command -v yarn yarn install --frozen-lockfile --offline --no-progress --non-interactive patchShebangs node_modules/ diff --git a/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index c8a2be9b3bc9..d9306ce7d187 100644 --- a/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -1,10 +1,10 @@ { lib, appimageTools, fetchurl, asar }: let pname = "todoist-electron"; - version = "8.9.3"; + version = "8.10.1"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage"; - hash = "sha256-L1uH5bnJ66QxAXs7yywG4H/FaunwTX1l+tVtRe2nxdc="; + hash = "sha256-Yp4wfibymHLGlaPDzu2rhSXxanwdXoNpF/d6+S0r+1U="; }; appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { diff --git a/nixpkgs/pkgs/applications/misc/tuba/default.nix b/nixpkgs/pkgs/applications/misc/tuba/default.nix index 6af6ef09dfcf..b8948f7d809c 100644 --- a/nixpkgs/pkgs/applications/misc/tuba/default.nix +++ b/nixpkgs/pkgs/applications/misc/tuba/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-1XbgsdIcnlXJtNEzDgEfHVJHF9naz3HplCPc2cKFUWw="; + hash = "sha256-m38ur7IxQsI46iMpveEXW3OZONbTI7xNq96XSocxxbs="; }; nativeBuildInputs = [ @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { gst-plugins-bad ]); + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion"; + passthru = { updateScript = nix-update-script { }; }; diff --git a/nixpkgs/pkgs/applications/misc/tui-journal/default.nix b/nixpkgs/pkgs/applications/misc/tui-journal/default.nix index 54f6e70db03b..3faaf38d7260 100644 --- a/nixpkgs/pkgs/applications/misc/tui-journal/default.nix +++ b/nixpkgs/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-LYOWU3ven9g3NCB9HAWFk3oCBFcWAXU5R4T4EIF14q0="; + hash = "sha256-uZjepaNFZCjCOnLwATP6fqza7p+Fvu/8egPRXgTkzDs="; }; - cargoHash = "sha256-MnQ5Y+mQIBh+MMIgL09clkPnOYIwFhNeLSvfEt9Lvsg="; + cargoHash = "sha256-MFo5e2tmhYvSUgrAA8RS4MnEXMvrY7xGiVrsT+2NWsk="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix b/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix index 83821b29e669..384b5362a4ad 100644 --- a/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix +++ b/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "tvbrowser"; - maintainers = with maintainers; [ jfrankenau yarny ]; + maintainers = with maintainers; [ yarny ]; longDescription = '' TV-Browser shows TV program data arranged like in printed TV programs after downloading it from the internet. diff --git a/nixpkgs/pkgs/applications/misc/typioca/default.nix b/nixpkgs/pkgs/applications/misc/typioca/default.nix index 71475cdf224b..f18e572c6705 100644 --- a/nixpkgs/pkgs/applications/misc/typioca/default.nix +++ b/nixpkgs/pkgs/applications/misc/typioca/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "typioca"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-PVyEvPktb2ortmPf1afk6vXmcp91Zei8BLwGkRazFGA="; + hash = "sha256-cm6z7MVAbFxfkSTaCfh8wZhtgXdfVQopqEk+w+hPZpI="; }; vendorHash = "sha256-XiKn18WCbhVvsrIvTN/Yquj4mhq4n1X1jqdGUaMacV4="; diff --git a/nixpkgs/pkgs/applications/misc/udiskie/default.nix b/nixpkgs/pkgs/applications/misc/udiskie/default.nix index e4e31669525d..277aba5c8074 100644 --- a/nixpkgs/pkgs/applications/misc/udiskie/default.nix +++ b/nixpkgs/pkgs/applications/misc/udiskie/default.nix @@ -14,15 +14,15 @@ python3.pkgs.buildPythonApplication rec { pname = "udiskie"; - version = "2.5.0"; + version = "2.5.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-wIXh7dzygjzSXo51LBt1BW+sar6qUELWC6oTGPDGgcE="; + hash = "sha256-bmpofyW5IBRmVlzHP9YRlI/JNnnamKfF9jCG85G0wBc="; }; patches = [ @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { asciidoc # Man page gobject-introspection installShellFiles + python3.pkgs.setuptools wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/misc/uni/default.nix b/nixpkgs/pkgs/applications/misc/uni/default.nix index 5f7db6f85bf7..72c4f84ba733 100644 --- a/nixpkgs/pkgs/applications/misc/uni/default.nix +++ b/nixpkgs/pkgs/applications/misc/uni/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uni"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "arp242"; repo = "uni"; rev = "refs/tags/v${version}"; - hash = "sha256-kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA="; + hash = "sha256-Ij/jUbXl3GkeNZmGJ82i++6VkOW46YFI9m83otY6M7Q="; }; - vendorHash = "sha256-6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw="; + vendorHash = "sha256-88SSrGvZSs6Opi3IKSNNqptuOWMmtTQ4ZDR7ViuGugk="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/nixpkgs/pkgs/applications/misc/urlscan/default.nix index ce70c5e9e599..e69b6330fef8 100644 --- a/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -38,6 +38,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/firecat53/urlscan"; changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ dpaetzel jfrankenau ]; + maintainers = with maintainers; [ dpaetzel ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/valent/default.nix b/nixpkgs/pkgs/applications/misc/valent/default.nix index e60803e5b6ee..75318acda6cc 100644 --- a/nixpkgs/pkgs/applications/misc/valent/default.nix +++ b/nixpkgs/pkgs/applications/misc/valent/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, vala , wrapGAppsHook4 , evolution-data-server-gtk4 , glib @@ -14,7 +13,7 @@ , gst_all_1 , json-glib , libadwaita -, libpeas +, libpeas2 , libportal-gtk4 , pulseaudio , sqlite @@ -22,14 +21,14 @@ stdenv.mkDerivation rec { pname = "valent"; - version = "unstable-2023-08-26"; + version = "unstable-2023-11-11"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "89d1e5a0312a0371bfcd9a95486805917c3729c0"; + rev = "51bca834b1c52a1cc49b79fe79d45dfcd9113c02"; fetchSubmodules = true; - hash = "sha256-28l+SkjVQkOA/5f5nT5BbqIV2BrMLmSK/YtDGYl1xjQ="; + hash = "sha256-jmhio/vS+w37IW81XgV4xfb/6ralMgAlwi3zigr4t20="; }; nativeBuildInputs = [ @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - vala wrapGAppsHook4 ]; @@ -50,7 +48,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base json-glib libadwaita - libpeas + libpeas2 libportal-gtk4 pulseaudio sqlite @@ -58,6 +56,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dplugin_bluez=true" + # FIXME: libpeas2 (and libpeas) not compiled with -Dvapi=true + "-Dvapi=false" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/valentina/default.nix b/nixpkgs/pkgs/applications/misc/valentina/default.nix index 09b3eabf1845..e0ca06af8aa3 100644 --- a/nixpkgs/pkgs/applications/misc/valentina/default.nix +++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix index d93108bdf584..ca4011220d34 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.20.0"; + version = "6.21.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-csJfmjKm/uAlINhijeqUsDVTemchlzWqJg/YHtmNlAk="; + hash = "sha256-7OHfFo8+MUNSI3vpOIODKQH41jmraHDJOyqfLBp/v9o="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index b6047ec13b6f..0acaece4cc02 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.20.0"; + version = "6.21.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - hash = "sha256-RliH4cr96lsigtoJiq5ymkIY8rbXG4xYmhWDAwZpSY0="; + hash = "sha256-ICRzd1iCm/TciVe0RqVFiiY74RK0KpEGPJ2v+wSRIEo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/Sylk/default.nix b/nixpkgs/pkgs/applications/networking/Sylk/default.nix index cc9e218bad35..b7eca10fc7cf 100644 --- a/nixpkgs/pkgs/applications/networking/Sylk/default.nix +++ b/nixpkgs/pkgs/applications/networking/Sylk/default.nix @@ -27,5 +27,6 @@ appimageTools.wrapType2 rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ zimbatm ]; platforms = [ "i386-linux" "x86_64-linux" ]; + mainProgram = "Sylk"; }; } diff --git a/nixpkgs/pkgs/applications/networking/alpnpass/default.nix b/nixpkgs/pkgs/applications/networking/alpnpass/default.nix index 81bdc29a54f3..edf8061da4d1 100644 --- a/nixpkgs/pkgs/applications/networking/alpnpass/default.nix +++ b/nixpkgs/pkgs/applications/networking/alpnpass/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/VerSprite/alpnpass"; license = licenses.unlicense; maintainers = [ maintainers.raboof ]; + mainProgram = "alpnpass"; }; } diff --git a/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix b/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix index 0b1047cbc70c..596ba95b7450 100644 --- a/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { # Upstream supports macOS and Windows too. platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "ApacheDirectoryStudio"; }; } diff --git a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index 93ba2ac105b1..fc32fb97f58b 100644 --- a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -155,5 +155,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ ymatsiuk ]; + mainProgram = "appgate"; }; } diff --git a/nixpkgs/pkgs/applications/networking/asn/default.nix b/nixpkgs/pkgs/applications/networking/asn/default.nix index e2a62c1f8b10..e81931c619b3 100644 --- a/nixpkgs/pkgs/applications/networking/asn/default.nix +++ b/nixpkgs/pkgs/applications/networking/asn/default.nix @@ -15,16 +15,18 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.74"; + version = "0.75"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; - rev = "v${version}"; - sha256 = "sha256-400I8aWQaPE7qCV/HqyPzuMmKpUyLc+RK7GCVgbt7JQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-XqP0Nx5pfYtM1xXxEDGooONj7nQ9UngJ9/AOZefnPV8="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; installPhase = '' install -Dv asn "$out/bin/asn" @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ curl whois bind mtr jq ipcalc grepcidr nmap aha ]}" ''; - meta = { + meta = with lib; { description = "OSINT command line tool for investigating network data"; longDescription = '' ASN / RPKI validity / BGP stats / IPv4v6 / Prefix / URL / ASPath / Organization / @@ -41,7 +43,9 @@ stdenv.mkDerivation rec { lookup API server / Web traceroute server ''; homepage = "https://github.com/nitefood/asn"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ devhell ]; + changelog = "https://github.com/nitefood/asn/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ devhell ]; + mainProgram = "asn"; }; } diff --git a/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index e2673068dcb3..7ac034568c82 100644 --- a/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ urandom qjoly ]; + mainProgram = "avalanchego"; }; } diff --git a/nixpkgs/pkgs/applications/networking/blocky/default.nix b/nixpkgs/pkgs/applications/networking/blocky/default.nix index bd07776c7df0..3f299be447ad 100644 --- a/nixpkgs/pkgs/applications/networking/blocky/default.nix +++ b/nixpkgs/pkgs/applications/networking/blocky/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { changelog = "https://github.com/0xERR0R/blocky/releases"; license = licenses.asl20; maintainers = with maintainers; [ ratsclub ]; + mainProgram = "blocky"; }; } diff --git a/nixpkgs/pkgs/applications/networking/brig/default.nix b/nixpkgs/pkgs/applications/networking/brig/default.nix index 23370866e721..8c659a99d0ff 100644 --- a/nixpkgs/pkgs/applications/networking/brig/default.nix +++ b/nixpkgs/pkgs/applications/networking/brig/default.nix @@ -53,5 +53,6 @@ buildGoModule rec { changelog = "https://github.com/sahib/brig/releases/tag/${src.rev}"; license = licenses.agpl3; maintainers = with maintainers; [ offline ]; + mainProgram = "brig"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index d51f3816ef75..9f192ec4f16d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.60.118"; + version = "1.60.125"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-Lo9F7z8gJJRId7LBfVTj18C65swDr8C7Mt1gNmXoSoY="; + hash = "sha256-ZctJBLEpaOzRK8BppMK7aT0kx00e7zXO+y8U38CCxKo="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index ff0c83527aab..249c8b45f3f5 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -253,6 +253,20 @@ let hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; revert = true; }) + ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [ + # Fix build with at-spi2-core ≥ 2.49 + # This version is still needed for electron. + (githubPatch { + commit = "fc09363b2278893790d131c72a4ed96ec9837624"; + hash = "sha256-l60Npgs/+0ozzuKWjwiHUUV6z59ObUjAPTfXN7eXpzw="; + }) + ] ++ lib.optionals (!chromiumVersionAtLeast "121.0.6104.0") [ + # Fix build with at-spi2-core ≥ 2.49 + # https://chromium-review.googlesource.com/c/chromium/src/+/5001687 + (githubPatch { + commit = "b9bef8e9555645fc91fab705bec697214a39dbc1"; + hash = "sha256-CJ1v/qc8+nwaHQR9xsx08EEcuVRbyBfCZCm/G7hRY+4="; + }) ]; postPatch = '' @@ -475,11 +489,11 @@ let ''; postFixup = '' - # Make sure that libGLESv2 and libvulkan are found by dlopen. + # Make sure that libGLESv2 and libvulkan are found by dlopen in both chromium binary and ANGLE libGLESv2.so. # libpci (from pciutils) is needed by dlopen in angle/src/gpu_info_util/SystemInfo_libpci.cpp - chromiumBinary="$libExecPath/$packageName" - origRpath="$(patchelf --print-rpath "$chromiumBinary")" - patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" + for chromiumBinary in "$libExecPath/$packageName" "$libExecPath/libGLESv2.so"; do + patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$(patchelf --print-rpath "$chromiumBinary")" "$chromiumBinary" + done ''; passthru = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index a241ee0dd7cf..c231febabd60 100755 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -78,6 +78,12 @@ def get_file_revision(revision, file_path): resp = http_response.read() return base64.b64decode(resp) +def get_ungoogled_file_revision(revision, file_path): + """Fetches the requested Git revision of the given Chromium file.""" + url = f'https://raw.githubusercontent.com/ungoogled-software/ungoogled-chromium/{revision}/{file_path}' + with urlopen(url) as http_response: + resp = http_response.read() + return resp.decode("utf-8") def get_chromedriver(channel): """Get the latest chromedriver builds given a channel""" @@ -137,7 +143,16 @@ def get_latest_ungoogled_chromium_build(linux_stable_versions): return { 'name': 'chrome/platforms/linux/channels/ungoogled-chromium/versions/', 'version': version, - 'ungoogled_tag': tag + 'ungoogled_rev': tag + } + +def get_ungoogled_chromium_build_by_ref(ungoogled_chromium_ref): + """Returns a dictionary for an ungoogled-chromium build referenced by a ref in the ungoogled-chromium repository.""" + version = get_ungoogled_file_revision(ungoogled_chromium_ref, "chromium_version.txt").strip("\n ") + return { + 'name': 'chrome/platforms/linux/channels/ungoogled-chromium/versions/', + 'version': version, + 'ungoogled_rev': ungoogled_chromium_ref } @@ -191,8 +206,11 @@ print(f'GET {RELEASES_URL}', file=sys.stderr) with urlopen(RELEASES_URL) as resp: releases = json.load(resp)['releases'] - linux_stable_versions = [release['version'] for release in releases if release['name'].startswith('chrome/platforms/linux/channels/stable/versions/')] - releases.append(get_latest_ungoogled_chromium_build(linux_stable_versions)) + if len(sys.argv) == 3 and sys.argv[1] == 'ungoogled-rev': + releases.append(get_ungoogled_chromium_build_by_ref(sys.argv[2])) + else: + linux_stable_versions = [release['version'] for release in releases if release['name'].startswith('chrome/platforms/linux/channels/stable/versions/')] + releases.append(get_latest_ungoogled_chromium_build(linux_stable_versions)) for release in releases: channel_name = re.findall("chrome\/platforms\/linux\/channels\/(.*)\/versions\/", release['name'])[0] @@ -240,11 +258,11 @@ with urlopen(RELEASES_URL) as resp: elif channel_name == 'ungoogled-chromium': ungoogled_repo_url = 'https://github.com/ungoogled-software/ungoogled-chromium.git' channel['deps']['ungoogled-patches'] = { - 'rev': release['ungoogled_tag'], - 'hash': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_tag'])['hash'] + 'rev': release['ungoogled_rev'], + 'hash': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_rev'])['hash'] } with open(UNGOOGLED_FLAGS_PATH, 'w') as out: - out.write(get_ungoogled_chromium_gn_flags(release['ungoogled_tag'])) + out.write(get_ungoogled_chromium_gn_flags(release['ungoogled_rev'])) channels[channel_name] = channel diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d11dce5a1051..33831a5f9b1f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2023-09-12"; }; }; - hash = "sha256-8xPm3vNF0HjfL7ewTz7iz7GMfiJi6mhMK1YSC7VeoSM="; - hash_deb_amd64 = "sha256-xAm7bPsnnJD7UWNTtHKMv5enHo3rM9w0M81QPqZVlP4="; - version = "119.0.6045.159"; + hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg="; + hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU="; + version = "119.0.6045.199"; }; ungoogled-chromium = { deps = { @@ -28,12 +28,12 @@ version = "2023-09-12"; }; ungoogled-patches = { - hash = "sha256-kgUrYXy2avfwfRckSYI6YPMW1uuvl2Osg4Vr9Q1ksMc="; - rev = "119.0.6045.159-1"; + hash = "sha256-ZcE5rmreXt4X+PuMalNRE7FakMIMOCyZQfhIhKDSxMg="; + rev = "119.0.6045.199-1"; }; }; - hash = "sha256-8xPm3vNF0HjfL7ewTz7iz7GMfiJi6mhMK1YSC7VeoSM="; - hash_deb_amd64 = "sha256-xAm7bPsnnJD7UWNTtHKMv5enHo3rM9w0M81QPqZVlP4="; - version = "119.0.6045.159"; + hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg="; + hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU="; + version = "119.0.6045.199"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 8408732d23d6..ef638e30a165 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "119.0.1"; + version = "120.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ach/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ach/firefox-120.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "cf90a2af34183711ef83f591436a2428bb48bcd5a3d0d0cb4efb0d37434f3baf"; + sha256 = "7261b9784146704182f2d9b180c868d61aa7cbebb7ca917cd42fa6980d1585a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/af/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/af/firefox-120.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "35b7475c9bb0cd12638851d73192c0381139b47bd65668c6451d228f767c5d81"; + sha256 = "420b971bacf5453f2c38d31e8f7d65c951401e3fccbb92173b2c82bfb22699a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/an/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/an/firefox-120.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c6cf760fdacc1902efe5ca3c06c22da43436cc0371b4f699be1de354fb7ebeec"; + sha256 = "37b49f961dd97d96bf4fd3920acd6d85f9afbd2c76a621753ebab8e3e03797bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ar/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ar/firefox-120.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0e0813d7d21455f62eef15130849e4fdaa52da9e1f487e3b200f3664f29e9076"; + sha256 = "9bb02a6112a0a10316996d0b008f45ce4c27210705b54495c6ca63436742dc4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ast/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ast/firefox-120.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "edb9adab523ced71fe3b85d6d2527a2fb587682601a7aec1a1ca9ab712dd2a29"; + sha256 = "dceb8bf7b0224e4bcba9b027d453fd60f83c6a24ce2e8e694a63bbae564d0007"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/az/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/az/firefox-120.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "af34649c9fcf0a397cc5715a4e7fa2cd21f165d8b7c1452542bb1e8ecbe7843b"; + sha256 = "8889b60439e52610ba0de48489163d6a8068ade2d4dfb992c8e010493abf76a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/be/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/be/firefox-120.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "8e88629368f81b58651ddd213048b25f62c8b4ddb4d5a9eb92ec5e2b7b4d83e9"; + sha256 = "0bfa1ece62b38df07cd8eee7690ab1fc897a964afaf1d235dd3f5c7cdf478a76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bg/firefox-120.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "926605f038c8d4d44210007471a2d617c41da37585f71e4726b64305b90b77b2"; + sha256 = "e4c3abdcaea8f27f0e161e4efd0400d98d7b6752e485bd3f0614c058a42a2c1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bn/firefox-120.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "50780e68b79f19e32a2b53b7d6d6c75948ffd2177e8abd7b97f14472dfed16f8"; + sha256 = "c23ea3a77292bb6394a44f9caaa11dbfa6b42082d0357b33b4b4322c73c8f505"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/br/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/br/firefox-120.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f39aa05fee3009f13af80a3c2cfbeaf3eceb3b02628cc6a312c23cb60baab689"; + sha256 = "02768d93d88e5af6513a19882c21d6d038814e371de50083dea0501d3834c8ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bs/firefox-120.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "bb58d680f4d6e63e2bb12f18da287f47a6ae5791b2bbbb924ab5bc8750ea382f"; + sha256 = "50f12f026b663e245abd4c94de3a2c9c7e4e12e8a4f7f1b2c841907d9b62b92a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca-valencia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ca-valencia/firefox-120.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c677065bd25fd39047b9fe1f10b9f654e29e8af131e1420e04d063b2e7a236c0"; + sha256 = "2df72d66cabf029691fa6a42fc72e29543201bc21fb67879d043b27e7beaff65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ca/firefox-120.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5436dade80ee8d46ec5cb3ad32b156a0153ad01a08d4e7a71f21f685e9db7df5"; + sha256 = "dce9f552cea74c4a71416af8d279fae86327c44c645431b54fb281bd465181de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cak/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cak/firefox-120.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b7fd3c229d0335ef2f5c5fa6f30847fea9596961863d3600fc5b333fecce2eb8"; + sha256 = "69193eb592264a0bdb10e851a4a09b81388a40c5754693aec6eb1ceef572b3b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cs/firefox-120.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "08e74645081c93cebc5ee40f6ddd074d1dd09e8ab822c2be496b20c1133db262"; + sha256 = "56ca1034d81ec2c7a6915f9b42da639f13b7c386b536df3c616c9bde4792756e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cy/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cy/firefox-120.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "28b6bd6f71805310b18cd8c4363da666051711433db849909787b4228ac09895"; + sha256 = "3ca612e2eaf1c53cdda54006b3161203198ddd2d9957675535ff157bf7704590"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/da/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/da/firefox-120.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "252918ac59d208c2f457171085974d4a8525a2fbaea406af0079823a6bddf784"; + sha256 = "bc7b4d42e874233c557e2cd533b6008cfcb58c17aa2d74a03840fff9a5cb3069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/de/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/de/firefox-120.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dc784325d72c64e1f7b9b6014538c0f6c728deb5398e5d43eae17dca5899c800"; + sha256 = "b1c14c7f90bec2ab5a9d7dbbc90c66914a3dfe4b7404d23d6d2e133a375d9ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/dsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/dsb/firefox-120.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "64b769c4f0e1b5c77a57302b5502a65138ca5f24438c34913abb27f08d56e3bc"; + sha256 = "7867c83ff736a2ce677777691343f901500b2471b01ff53062b7c5b73a886c0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/el/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/el/firefox-120.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f0db76422f958cc3f7b4cf29165b41cb50a3aa04ca74265397f71cbee925cd9b"; + sha256 = "437adb01c9193b965c4612f71625c3b486f9b82716c31cc3a4e215c10178084b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-CA/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-CA/firefox-120.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d9e86adbfe21f7f503f12a5e084a082e6d6b461cbefbe94881c4b752629992c4"; + sha256 = "058dd94236a1b9fb6e7692b9875416ecf7fadf98fbe1c29004f7ffa06955782e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-GB/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-GB/firefox-120.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ba27957e33e3f4a8a57735e058b84c004da9a6357731f58ef4daf2237f8d4268"; + sha256 = "88eba42df3c4c240e35792cfc571ec2b3a2b53cdf015c1b12797c80b76c17fdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-US/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-US/firefox-120.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "7d7e65a8e8f11a821545cdb9a3348c68d4fd60d2b6f5454fb17dc4d42fabde56"; + sha256 = "340a7ea9a7b230ef3a8e81c8053d5a2f944760ca9b32987a4a2ce52e8f62294b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eo/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/eo/firefox-120.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "892a91efe311e99286e44799b7f50445a27a29f0ea9040e556d29aed5a343421"; + sha256 = "bc1621f82df6a090bd485b5bb2a1d97210686740729a5076e45bdb6b41e330cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-AR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-AR/firefox-120.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "65a1324bccfad9edc6adda59362753f5272fda40d8b909606bd120fbf36c1ca8"; + sha256 = "d87be470cdd767428209e138396a929851da35f2733bca93709184392751c0af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-CL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-CL/firefox-120.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "6571688a29d48d284309bf6c7f6648ad5bc973b6399a15d1f6f1d06304bf116f"; + sha256 = "a389f0c702eb1182086070bf6b0e28be107f0cdbec5a24f9a3e15e4cd46f0bd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-ES/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-ES/firefox-120.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2e2e09a0e93857a4405ea4f30db542f445f8f3faea324131d147a95ba1e8f58d"; + sha256 = "dc680f687574379ddc8e08235a24742c641fb3f0c8a2dab16a3a998ece9e2994"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-MX/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-MX/firefox-120.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "eabebd5780be18881bfb054e6bb7f9c98a823a3de443e8fd044ee59c7e60d55f"; + sha256 = "6960e3ce9ad995181a4471e8030d3b0333b7d1573a2bb323609ffecd1febce72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/et/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/et/firefox-120.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7c5bfab9fd30c5b671a1901071f7de0d555c7637f87105b5af949fdcc4eae0c6"; + sha256 = "a6b39af56d45adaec536e6604fe03ef09efea984c87039b968102b2e07c45d53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/eu/firefox-120.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "617f6f49e8d8eee2549a33716e9911209a1cc049327cd4f6bf00825b15ef21c8"; + sha256 = "4ed6e0a02af8ef08f2c24c7dfdaec91f9b7081ec405a99af35c4c527914b95b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fa/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fa/firefox-120.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "17cea2b9830e500f9ed8503e153fe03c4f4ac924fa3e9f6e757c37ced72ee0db"; + sha256 = "6961f23a46e30f2d1c210a039f88c7e0435a712fdae0b0dc232c9efde9ddcd6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ff/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ff/firefox-120.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "704e1b267c71f76c16ae62a39c52a8f3cabd51ab7ab9b5a5734afd3c978a59bc"; + sha256 = "c43ee72ede3ee0ab6b07566422e2a774135ef8d183294965a05406ee8ab2ad95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fi/firefox-120.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ce61c29255cdfce6cd4da9c7ce7e3432629b7fb08f35314ff12282d0e4f8af45"; + sha256 = "3e95a9abf7b409e81d63849789f65a28331f639afed9e4c681d0321084bff04f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fr/firefox-120.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "0c5f6b764a9a6334d9759ff0a58a0129cd9d4054ccdafc829f2bc902a19d4630"; + sha256 = "c286d422edd48d15481e6a188590a39e9424d996558eaf3f039da7e78403085e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fur/firefox-120.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "f9df9b54a4bb771ac4faae64de3ede13fda4026424ad0823db8f437f3520a966"; + sha256 = "8de3ffb4861c4729d7b90d91c906d09f9ababa5e6ae9f714585b35cfb44547e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fy-NL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fy-NL/firefox-120.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f71d895584edb495d80773e9f8687a1d56ff548cfb332ebd2e226bd500d62b7a"; + sha256 = "6e2745f3ce0df7bb880a31e9bb9b0824abbfeae0171e07fbfa5e30b10912d370"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ga-IE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ga-IE/firefox-120.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b7b6b99174277532bd2486dfd86ab94c036c5a1937336467376dfd7e885336a7"; + sha256 = "95a5a80bc9ebfd4395e10c34ff3d5d6f2a30106c2e6941b7b07addf14edb9e7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gd/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gd/firefox-120.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "43f6432c2b1e21b5178d83ab7cfb5381ead41029b24e3135ebe6daefab5aaf65"; + sha256 = "db8dfb7783b12a3e9729cc9352da8c8299d8cd0b009778805749b090f86c12bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gl/firefox-120.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "69bcee258ce0d6b39e7654484950b6e45f4306f2067d36fd5c67acf248468c1b"; + sha256 = "f8101f9b9512dac67c468ca865e1bbbb5769395b1120684ee993556d43144027"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gn/firefox-120.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "24a154468da6beff23afe0496d5c0b7c526f849eda9a0ca30e535de459d4ee3b"; + sha256 = "a84726437ce8d980565943b6998c1635a7b7bf766feab9317b1a369d2b878592"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gu-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gu-IN/firefox-120.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "442ba0d079f8076e5de265b91dd27cd747ec27f88aaaf68b5dc730b98b5a93b4"; + sha256 = "5b8b2e6e444a2a5ce15f92447345f18421739449db835fcc06f9e0e26e02b14f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/he/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/he/firefox-120.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c9de9ba5a4570e3de878d88404ee821ddddfd817fa62522b16e3b501ee0221ab"; + sha256 = "894727d171dea3784a671f473c0a4b67496ac7f54f0130360401c1fc6637ee78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hi-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hi-IN/firefox-120.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b9a5a03540c19518629e180abc5680328e605e6c3c5c1128df12bdcba1a0567c"; + sha256 = "1d9e40b7eff8a2b1a377ebe2a03d310bbaed58d8b5d32b780a3c44f29676dfc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hr/firefox-120.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "20bd65fb8a50d007f5f8ea1ec1c90ee118d598b931c30078f89ddae86f4dbf83"; + sha256 = "4714572bbeba00141d3a9b683a69a9cf5b44c51e9b7f262cba8765ed4ecb9998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hsb/firefox-120.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "11d2da7ef251c5c065e5410d912664e641c9ce9b99f140dfa33ab549e52590b6"; + sha256 = "eadd9c74297985a8a33f30d9597fe5f808cf224f7e66f7045f12ed1ded3261fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hu/firefox-120.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5afb7d769b1377884f155d952243dde4bfda4231e21e37c21c6fed9aada72f82"; + sha256 = "a1a0609ca55bc551fdd045faf65aedb130a0fbbfbe82b4c86f0b02044d1f2e2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hy-AM/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hy-AM/firefox-120.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "446e429b5f51ef686b8437583cebbe05bea9899bcf15b18bf2a409a5488fd2cf"; + sha256 = "10fbe2959447353e302c5a1e2e676f88fda07a213b0f48c9f64a710a9b6b1e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ia/firefox-120.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "dc24337bb7919c9d1e6943688a6c23fd35cfdd259ce3380a11865e42f80d9c85"; + sha256 = "64129e1ebc5797f0f88e90880452bfa8cb823cc28a5fa833073324b769bc74f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/id/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/id/firefox-120.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1055e7944bf3718cb39a9bb974492348f5d4133fbb36caa25dc70a422a1ae65e"; + sha256 = "468af01d74eaf91ec9ca862886db3eb5d5260bb4a02db324d28f87c314080d47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/is/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/is/firefox-120.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "92d02b4eba5ba6932157a89cc54345842db05ded27303d1a6a3f41fecbdc3d99"; + sha256 = "467f19393aa187d57f526b066f24404368b8a3aa3d46843edc1e0d8f9034f753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/it/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/it/firefox-120.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "42e8fd5a2b9ebd70a7a4c06e540235705e83f0ddb04ad6e4a896bea3cba28e62"; + sha256 = "e4dc3d17bd70c2cd08d5ee0bd1f933de50f1e702a9bdc2da90f4f94f430db2e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ja/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ja/firefox-120.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d3428500cc6c12ed769f4dbe8b0ef3a3f8dbded9c03e7a0ba602b4694a4a1ac6"; + sha256 = "abbaf1073e3ec9f29774aa6df2abb972cf18029851b066ab735cf7ba999946e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ka/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ka/firefox-120.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e233bce15359f237b59ef3a86df23800cf6ef0566a1503c343b4d392b4100adb"; + sha256 = "b0da46ff1e053d42f7ca16963ea8d44b4cd8d3a89f8201c2b4ed3918a84a0490"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kab/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kab/firefox-120.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "18bdd5a8c63b5670545076848d25be9002742eaa18139f35df35b5d802065e33"; + sha256 = "8fc834b0e09827a727b6aabd557bc12b4c7e95f6a17e231a341b6ac5b031a049"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kk/firefox-120.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "852365e6037bda685eaceebd965d90eb76f6b8519a06ca9a6fdbae9a945b5f70"; + sha256 = "613268846c3cf6574d50e55d5c474634fd7573ea3cd68fc16b1fd6c5ff08e23d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/km/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/km/firefox-120.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "31e9a5977bd9280d8ebc392f1133a2cfb0837a4ab18df8188bc4c1202de3af58"; + sha256 = "9365ae8f344a3532ac1ac4eff63811791e32af12d498563c995c0e160f96c8b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kn/firefox-120.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "25fed3cac9a152d696b7016f1ab1b954a763e6476797bb7e8e1c69683e5683d2"; + sha256 = "c5e074479079042fdb955e11f4c4a193cd4e894bb5afb1cb2c92f5308198f006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ko/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ko/firefox-120.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3e26b5dfb9625b5a422caf9da7f4bad28ada9853b169ba2505c7111a55d20c30"; + sha256 = "4319d5bd2d5a41c87e212ca2ea7666292e2f2f08f22768699bd86904bfe65bc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lij/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lij/firefox-120.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "669b90a4d97e6baa310c096c82a14536ebc95287c3df21de97ae67c7808c270b"; + sha256 = "b26f2a7079cf633da7808f0a6c40d556ee3a52c72d77433cf289ae9fac2e8c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lt/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lt/firefox-120.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "20aef23a5e3e8573c22c600eb63f920908737dcff33a049a67790832eb8f02af"; + sha256 = "86a35c164d7998b6be554ef2b7807adb5b108491e558a414b09b37ee2c619245"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lv/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lv/firefox-120.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "42c48753d41d85066a2d1152af29d59e86945eaf8928726670fcc77f880baf25"; + sha256 = "199831283f7e6a3573993a03f9ea40ee05b238dd1d6201915c36a9d0669e0f16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/mk/firefox-120.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "563c1c0e5c23b3249095cb068d70333b3ebb6598f5099f32418b040c680475ed"; + sha256 = "cd8bf243dd94eed0a5904c80a6f331c7af0fa13731822d1ca44471450dade265"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/mr/firefox-120.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "69702f953054e70572b2e7c4474641ccc4df119d962a1d2341cd898d943c88b1"; + sha256 = "6b8b7f5df3182d63a5174ea79002bd698075341ba9335a770b49c506f8f14e23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ms/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ms/firefox-120.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c61b592b5aa9a8863fe7fc7950d72701698efb3e74addf19fffebe6750866fc3"; + sha256 = "205f17e0bfc655d3842444a44b27163b2a9e92f430132946d51de7cad5f46520"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/my/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/my/firefox-120.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "18428c4c73468594cd9c2c22ce654c028d3c1f9894f37d263f79ffc222f092c5"; + sha256 = "9142c797c3d0318b71f23310c716ce703e9dfbf4682f2f9bc4f0994b0054b7af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nb-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nb-NO/firefox-120.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f2989993ea8ed110ff2cff4eed467a03156ede2db4e87864f7750006bc4cd2b2"; + sha256 = "e8f0458d543dc0df5be81a53ee7b66ede0b988899d914a9fd0b9f51debb1ab3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ne-NP/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ne-NP/firefox-120.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e78b3a70f1c71d8cfcd3f72f5c07cb6ca3f2b31b9c25c616db518aa9d1d9262e"; + sha256 = "2718dfa28173373563d120684ae9ffe85634cbf0cad332018f7acf08a958d0b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nl/firefox-120.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "87027a0b36cdd388c0e16048074655fdb55a96f03561abb1760adb015a10df80"; + sha256 = "191012d84fc1349b46c8c9a60739aa16e10925595334ba5ebe71b8183af27aab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nn-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nn-NO/firefox-120.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "20768f6e2fa0abf0d0e438c7899ded5811824ae5bd1474f978526a8424e423c3"; + sha256 = "ec5d00408f471bf873a574f6611cee60e6ce09119f5ead39e28b9f8e782ab95d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/oc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/oc/firefox-120.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "63ac23dbe4886a07e0443e1772e5b3578ea1d4f5043064e02d179e2255c68fdd"; + sha256 = "06710541a83e0ad27aab4d976eb6b2e44512276b4a0e0f32dca1a418b82a7b52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pa-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pa-IN/firefox-120.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "22d3209d47e2bb368f082b59c9bf674ac0ca3bf7f458361a0d2ed62a05d0b39d"; + sha256 = "86f23f3a40fb434197d0349dfcc30c1aa7acbcedaf8562b1f9cb107f11da675f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pl/firefox-120.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "660839198b7cf81d943e0af33ae5e2d257c68b2c4f9d5f4847029c303bcd1a35"; + sha256 = "bedb7b5dffde7903a2f392a0b591091e3b6df02bbd65ae6509c100602f686b42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-BR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pt-BR/firefox-120.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f9dfcc38f180ba7f0a68e276ae32ce4f30da1dea5e41fa1c651994e39a2323ca"; + sha256 = "032ce640b47c9fe6ea34f8b4446db9b8c7d5983902027fa4c31337db90c5c170"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-PT/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pt-PT/firefox-120.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "41fea86dfc01560fa02f112ab1458fb2513e214f5d311ce3f73d3dacb23f0f98"; + sha256 = "a7cacc08ce0ae3d9c62271294d4e8b5ebd4e9128d5898cf6c2d891f1912e3763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/rm/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/rm/firefox-120.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4e59cfe5e937c5d4c791f2a3085353699274300641878c0eb6ef9e1c008abe7c"; + sha256 = "9a9d34ad86d7b9a06bec9346feccfbdd7eae7b9fed6700c753cd40870f63ff19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ro/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ro/firefox-120.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "54b01409fcb03542b45eb5913494765685c732c25e070d107e8df4ba9084e87b"; + sha256 = "134b4c16ca280a565a5a21bd278856e0353b4ce505513c3df5d26984c23a4009"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ru/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ru/firefox-120.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8df2fba5aef8f65bee4fcc0db8a8f809c65d5da7e631e378841a5f7f6a1365fa"; + sha256 = "648e085e3937565065ce8da32dafdf6119957c8994b47dcc153adff668e87ac4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sat/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sat/firefox-120.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "0c7e22d71463681b6033f8e783edf05199c1bef26e80143d03b85c5a013eb09a"; + sha256 = "eecd8a88202986c44a17b8f2035ad2bb1c335b4d852a330d6b5de4043206a19e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sc/firefox-120.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "d59f5f0012920790bd575de2fa03175f350179e728e3f2b39429db5918cc4c87"; + sha256 = "937231d9548496bdbd097a4e249b3b433b76dba5c30edb040b61d6c9e1fc1135"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sco/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sco/firefox-120.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "fa3313e39e27e83d7c7052b561ee8b16e5647405c712d6f9fc180f5b79354687"; + sha256 = "dc0e840fb5e660e83851649d0b86fd9aadac51525b5c96a0bc05e36a1f833824"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/si/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/si/firefox-120.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f0f6b7610bee29b293dd284dc2c8bfc2a8e823569603464772413cdd0215ef0b"; + sha256 = "52344c7e38ad40306b4e064205a06e6a36d92ae3826422744a2bf66aa369df5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sk/firefox-120.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "34a45a30785950c7dafc86a704f12e0ad452fdd8b685d98501eb472c87a35c18"; + sha256 = "62ba51e311f5dc9bd53223c2ceae72751a645982d145aa4c4583322a5ab96ea4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sl/firefox-120.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4f554a7428d4ee3adf7c781c416ee56725fb17a976fff2530823b9352a6341b4"; + sha256 = "0eccf03cee663928dc92bef83cadb2728596fe00d32ad5d8056e48ab19e0535c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/son/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/son/firefox-120.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "031c62d2d5451ac522b2d7760bb9f8f74cdf7afd9336b1f1c3a43dfeac1260da"; + sha256 = "07f5bc3b8788b13e67095b47ba544de4dee364cb39e0c435e51de0234cd78af3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sq/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sq/firefox-120.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "00c0ba4f17fb761b3646eb4e9c224cc43af4e763ec660fa9cc4fb273e9802dca"; + sha256 = "2ea37bb1012aed2c32f94b43fc6b0e6c21e6c01d37e6821508abb5b9537ab53d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sr/firefox-120.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0f413e14ab17a324e35e582a108c68fdf7c19f5dedbb94dcb30ea724c1dbc7a9"; + sha256 = "f90e1272fc47144d586c41cfe45091d3263a76c74b45763a4acd428efb4a0f2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sv-SE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sv-SE/firefox-120.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "39bab6f47250385f85c1555f916689c40cfccdd64ae0f433a6cc74eb6a0b7b3e"; + sha256 = "f4b7158fd318fa72a0b1a13e75bf6781580df051ef636b7a6128d78cb4cdacb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/szl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/szl/firefox-120.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ae2e7059c8612023a4a1f0d8b5ef816243e7472a98487bc415e50a5d974e9d71"; + sha256 = "dbd9f407fc4d5e6c33efca730f1524c682424c46dd4d82f039c72526b8117f1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ta/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ta/firefox-120.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "a3e60bd086c3899f45b6b8c39081dc3dc2933862d2d789162a876e65e5c69e2a"; + sha256 = "e843b0ceff3c7b706dea4029bfc32ed1e05354d90277c7bf595c7ba024c3501d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/te/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/te/firefox-120.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "37ec9536f4546d723d7aee5e61dac25ba0717669b7cc883a52e4fe6ced99335e"; + sha256 = "03de55ee242a343a5ce3b3346dfceb97a13120c8aa7ae44b01001cc7eda2b3ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tg/firefox-120.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "0703039b5362d9023c4c4ca70c5af46086fdd427353dbb8458aa3c646ed8043e"; + sha256 = "d9dc9158a5c064cdee76ae605e1096c516a5079e875cbfe215c765ec9018e926"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/th/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/th/firefox-120.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "08cada5788a4436d03dd9fc1f19303886d76825e000f7242717e0fed9800198b"; + sha256 = "9b7f996dfdfeaeea549e5dfceb8c6b7ee4261cc3879b40d9149c5faba5b73e5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tl/firefox-120.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "09b9d91554cdab127a9be2d08d65e801c04be9645053fbd7155ef0c08701124a"; + sha256 = "3f7cf5e67f1f591c57b61624272bb23d3f89e62fca555bbfdd71e6d5fb3ab1f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tr/firefox-120.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "64e057a8874bf3f4ee83cb2c82e8f355880b7e05999055ac9e3370371988b5b8"; + sha256 = "6fd28a1992d2de1ce631281b1721185a878f1a3ac16cb149e98c1690ad60b06a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/trs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/trs/firefox-120.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2fc9c15c5147e7971bf1bd9e521e20a34a449c6063e426a4b102dc067a690ee3"; + sha256 = "de8efb4e8d9edb8f19824b6456fcbeb1688001f41e3e9c4c9ead6825ac4aaa72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/uk/firefox-120.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "02b726c51b634ed7181b772b77bf0b5543dc77727563e911ea10d381f2ef1efa"; + sha256 = "543a7a0f919e8497a69e97605333a9cf51c5c88f95140f4ace579366055906d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ur/firefox-120.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "52749b68b455d4a1054c00b75185c18bf05807716b752164559a995b4740e00f"; + sha256 = "a913fb999041219345483c6c32f4d3b68b8cc97d46e33ba20814195d0945555c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uz/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/uz/firefox-120.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3f789d1fef8d5729af3c3f53a7701e543fb3da9eb8dee6c48c9bb815e894a7de"; + sha256 = "c7908e88c71332a71e70caa390f08efd3444cdc1f8f0e55ac997524ded8e7f8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/vi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/vi/firefox-120.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4b9a103512983340a3c3d51da4b0044826cf8e22eae1479d06a64e0b3827df3b"; + sha256 = "4abaaf12f0ece14115da876e79e0dfebdee9ad8f9f4c540b391502cc71d8e092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/xh/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/xh/firefox-120.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "13073d443f3491ff828c913689f0b32e1ecabe707ee2f76f6a0fc66f28b3cf64"; + sha256 = "16409657ed62fa92f0f0b3ae2981fdc9a9ad45659592622c9ffe81a01e5b818a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-CN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/zh-CN/firefox-120.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "40a6787e1ed8d39b12e494d33496b718e19eb354c7d9b0bbdffdc438978305c0"; + sha256 = "a14938714c864310ad4c0d7f2d7aaeb8a7d658ae674d7dd277570280cdba5364"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-TW/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/zh-TW/firefox-120.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "800d19524b1c62c02da3a5116b2f5207ba0e238a30735bc10bebdc3b0e55fd97"; + sha256 = "35db6f291f8efcf493fd1fe3313a500fc11891f29dec2f24c53a8fa5b59bf4b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ach/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ach/firefox-120.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "995e3b86a9f1365014bbc3c9e34c3bbf7c8836e36ed16a0cb6e872416de98b9c"; + sha256 = "6d6b3c203ecd57b8325b44df60f1c73b96e209f2fe97b41fa345057554b79f75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/af/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/af/firefox-120.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e519b620bd95162697511d1e1e6f8c1fb623dc661feb4b9d94db6cb17c318d28"; + sha256 = "3d64f3a8ba54e46c0db30bd2a581ad0047fbddbed038cfedeca7829039957e26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/an/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/an/firefox-120.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2b44a7eadc3828627d572d5354d062cdd1a5d8ba545f2e69529d6d4375c4d367"; + sha256 = "7e82cea049c85b4604c1ee549499d78f9bbafb27160f1a406d2422d071353098"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ar/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ar/firefox-120.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e1bbfdeef1957926e0a2d849a483f5d1d75d9d29dc3373845ed19433104525ff"; + sha256 = "c00d163008419f17f429e77577d94017cba391e29a15cb8c8539b1d191c4e069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ast/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ast/firefox-120.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "43a0f6f95ed2dcb0add16ba4b765a164614a81a217b8eaf1f998aa0d89ae7417"; + sha256 = "fc2e1f5d2f80beff9171c5ecd3fe63c23bbadae8b18627617720d2f018177d72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/az/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/az/firefox-120.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "d8dddd74ffdef6fbfe9924e6fca9c8b436130e7cb17a184d682fa93d4fdced41"; + sha256 = "997f1a81ec8d1306dc14764c098ae13f1f041862247f672d891d17cd1369dfcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/be/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/be/firefox-120.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f2a07b563a6d0085ab68b58bea9203a3573f6f0b4e673e7f0af34f0bd709f607"; + sha256 = "7e6f9ee14b6c5d08c22a7ff5bf9ecd6622992fd5f1d644da9c0b2accd4b415a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bg/firefox-120.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6257b89abf9a07176b48f6b8089bbd1a9adf67c2c15f778a11d95e137d3eb987"; + sha256 = "d8dc55be45f40430d126f7d365859aeb1f6c1be8d615eaa368e93f740c6a8e70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bn/firefox-120.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c110e7b0d3b1e8f21a3c6e8ff3c25341c66def3c28aae3010a73f52f02dcfd8c"; + sha256 = "a8b955eb49bdc369e69007b53bfd6ccdce62856b695979a957ed97ffed1412b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/br/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/br/firefox-120.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "fcf3dd819894dc19c6dc6ddf836c6a0a73b1110487489f3247f816a7d8e9780d"; + sha256 = "11ad446f9d3893bba9ff2aca01ae9a5779e56b3f0c48fd3c7cc588f8d4649a3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bs/firefox-120.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "c8903eab5082b5fa8eb5fcf24dfbd0d8f244e1cbf3e79d4c826622a2c6e2e385"; + sha256 = "4e49e589fa66e2f19dbdaf71be3763660be024d0824041852f239c484eaae843"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca-valencia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ca-valencia/firefox-120.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "02ca7f29bee2e06af0dfd4757beabbf82e45b77e8d3fc7cc544f93d5776843ae"; + sha256 = "ecfd1243d5b8b1b7be8e9c1d50894e5ce6341eb15cbb1fee4e68b92514e2cfd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ca/firefox-120.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "47d743c84c6e3e507957ded5092c6c7d67b7f52d9eec4dfde65dc2640ec3af1a"; + sha256 = "ce2277c0592a4ae3b60630dac7084048b3c9f79a03ff9c1d6c60f5346f57b163"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cak/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cak/firefox-120.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "368237495ce87e0e5a249421a0643d05d02bd44d1138b4c4c614eeb34ec44d7e"; + sha256 = "459c72e9a0ae2b4c278bbada6b4545083101d0cf324cdda6c68a50006818b3e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cs/firefox-120.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d4170a9b18003c32a17144c5819e7481d610b3133363008c21c905d11f9fc752"; + sha256 = "340bb19b1593684055f2660b2acc5e34f773673e8035b897d41363c69772371b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cy/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cy/firefox-120.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "75d2be292dbd8fffe3b6b92002035f7e42bd2dec6956e449973be88bb0debfc9"; + sha256 = "f403fd18b0a94b303eb9aa68492173bc5b69e3fbde4173314cc4eaad7c1060b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/da/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/da/firefox-120.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "22d42d3ac8be47c35f97bbb3cdd41836b7e0a0409617e192955c5f5cd96266ff"; + sha256 = "c0f4dc9cd1b6935a4fb66502bdd13f8c8186a84211f49e5e61d9bb827b9f4f07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/de/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/de/firefox-120.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6cc88df9de046096bec39504e5ecd2d3051ef4331e369867c5e6567acbf65cc3"; + sha256 = "0ae96c328e4d632124dbdb1b31978874bde3e88c7030cf1ab6af54f73a94368d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/dsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/dsb/firefox-120.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a81f9efae2e4a769be060e286b8bee0d00569c0a53cb839928d46c96fe65bfe5"; + sha256 = "65845b1dd223a05fd23be7b81cbc18e02020b8e30c955f09d40eb6320f9d2615"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/el/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/el/firefox-120.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "bd4ebea36042e849301bdd843e482d50930d8810fb5d32947fe4511de48008b8"; + sha256 = "f0a6ebe0307fdc5cffd63953d5b5ba23f792eee74e7a79e65be155a62d149caf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-CA/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-CA/firefox-120.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "2e6a07daf47d70295bf39aee8bad62ea334ecffb29f219b87ccb73521f3ee3f6"; + sha256 = "c3de315a373ed9a9f15729036394ee0a394785a787d3ee9946077b0a93085809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-GB/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-GB/firefox-120.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0585fdbf94e401c00e291bdd22b3c137ee0effbc287ff44f2d5a6b6bb9df6fc7"; + sha256 = "cba09755f156e3e117d00dcd77f4bc3c080b7deee31fcac72410bc76bc4b0efd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-US/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-US/firefox-120.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c3faa5a469d1397090d3159e5a336a065c9722f94bbb107887805b0d62b02e4f"; + sha256 = "924f0032446b4c2fa6cbe7fc98ad8bc6d89808c4fc35f948fbb1dfead2ef7b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eo/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/eo/firefox-120.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0bf1cda5b3bcc8bf0c0964e5826db28a13705a969a0e6dc14a6498d62e167422"; + sha256 = "3932293c3c010f0ee71998941936822ff5985d3d8c19f8ece40a695314d54193"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-AR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-AR/firefox-120.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a8db855598b21922a3f8f0e0aa70e96b27c9f4164906975195094b024404053c"; + sha256 = "b1de43001cc06d90bcdcf9229664000d315bdb3af66a5fc667891c5b1e09adac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-CL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-CL/firefox-120.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "8aaba2eab96010c531fc3c13e0e11b3ba31aea1ea275d22d2d55ed91d204d8ea"; + sha256 = "b13b50b85bd569a3cca6abaa3488a96422f44c631314982ec68343efd585f427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-ES/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-ES/firefox-120.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fabce87a93462cf25e25435aac5b704d2921d9fdefc44f9d9ae1a5fc13e6d895"; + sha256 = "22347e7e26642a67c9354d90863c0659803ad0d3ee04cd6177ac59d770ef2e79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-MX/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-MX/firefox-120.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8ad782b622ed063fb0cbc6f509fb2edd34537a0096c93ef3f861259b5166ad41"; + sha256 = "14b17c0bde5b7f110b1c270e6dce7e603247c20feb60f034b4c38cb58eb28fca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/et/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/et/firefox-120.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "48d3c7ac37d505e1734190267cb107bbf72d8286a238532da1b86cc97494e533"; + sha256 = "ee94bb80d52b854375676fc37d2224bd1760b04c41952fcea76c3ae9c1c2eff0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/eu/firefox-120.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f9ebe4ff904ffcc0545d375ef1595d99d4253fb171780a569b4610958b264946"; + sha256 = "e6cf36e85d4562e733bf3a7bb09230156892fb11f112b838286da5f2f142a9c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fa/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fa/firefox-120.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a65eb2459e5b2ac07c485ae142ee67a56737c309efc055d064c5b1314d01277e"; + sha256 = "7a9fa8d7c9e340c0e7e668fce6085480eb0b02e67472a20f2732e0369ed15141"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ff/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ff/firefox-120.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "01560cdc2d01b1b8423a68698a4273870103c2c4e6d34990813db6bbb2d417d7"; + sha256 = "35ea0636918e7d263b4f1bba48f78a3328fe1d16dd5536a8a4fb24fde7f92ccf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fi/firefox-120.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6a9ee52625a8add941f2018c53abe1596ff8eee2d532b53092ff640af478d081"; + sha256 = "cb9e897b4466601c1bdaf6f99eb778f7970e16de87d67a3dcd30d26ec78be11e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fr/firefox-120.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f8ff14ecb998b4945041796e189fb87cf309079b922cf397c05eeec2dd2c9a46"; + sha256 = "e753c4f9b9403e1c2028dddfb41c4c11265e0533058f5e30731f7e4eb165c962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fur/firefox-120.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "349a4b860435c0d65a84a12e074d11209b3f0ab8856c005e5131f09cbfed1900"; + sha256 = "02a0ffd7a52e49914826eebf599c0ebbfc2600b515c54e0c76fa724ff2eddedd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fy-NL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fy-NL/firefox-120.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8779f243e0918de79039734a6372a25b01b9a5c9ef2e01c757309237d588a694"; + sha256 = "450fd214944fbce6895694384549f0d0c748af365f2e469a0d212b895e4d8dc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ga-IE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ga-IE/firefox-120.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "21b483531d4a91e920fa5ff6a9f267ce835c9c5941c1af913021f5cbcbdfa84b"; + sha256 = "6b7f8d6204409cfea9ac8eefb9e0653195e9f7d8e59cbc3632b52818733363ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gd/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gd/firefox-120.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "fbf5fb03e13a8b9eddca4f521299ca620570b48ef11bd34ef6e37643f3280cc1"; + sha256 = "f7023ea44357a24878cab6cf644c4f5a64035e731b511d7029dec48cbb13b0ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gl/firefox-120.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0fbe3e59568261b7f96805a257df8320690d3a9952fa421228ade5042b42f36e"; + sha256 = "2ea045e690e216289990f3b3bc2bb0fc7080ca885184ff637ae9732768ad842a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gn/firefox-120.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "1b35a1efe2321821f26fdd97c414145dfbefa7b5fda8ca94f8d9c7911ced9bd8"; + sha256 = "5ad75c39f17e4c341d51f50ff128d80efbf1bc4f9b3eff58e3063e5d8378e783"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gu-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gu-IN/firefox-120.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5aa7c4f18a983756d45b6f8273bf6f73449e28426616aa32f5092e9b67ba0d79"; + sha256 = "293dc4e2a01dd93e5d84632257481adf278ef3f2c2860410ed4ffc0e8b19f513"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/he/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/he/firefox-120.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f777ee429354b7e2facf45057cd4552493fcbcea52a4afd298555ac87306f692"; + sha256 = "846d946394df370fefb5cfa08644789254290795e26c1ca5d851efe8ec61c314"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hi-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hi-IN/firefox-120.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "74ed18e2f5f8b8d443df42810f849dce6339343566c32bc2cc6a82446680217c"; + sha256 = "f86b0a54cde49cec714775b21ca733c3c550b9b18f64d37562a4cb64cedeabc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hr/firefox-120.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3e5a37911a3013b46e1f801e4f4c21c304594e4aba318a87ef29a9be5a4da687"; + sha256 = "b971171c618d7a7793fb7afffb4f6fd0b6f764c0ed839a214911186376460eec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hsb/firefox-120.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "12c8a1d884b6bd2d056a1c44debede068e6e09dac0e871894b89150e321f94c5"; + sha256 = "2afd51995e4a49e5731ed5bbbbee08aec5f23e11d72ab973eaebfb42704c34d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hu/firefox-120.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "47529ca31f8c81eb6b19ba99552aed60c712af2337ae0af473e212bdbfaef29a"; + sha256 = "255487be8c811cd539ff74fe3ed42722f2f55531b581888a98e41785bf9d6481"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hy-AM/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hy-AM/firefox-120.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6cf788b21ca4608605b1ce539fdcc0c7b8610f4dbf98109b8ef0c3b9d80d8fb6"; + sha256 = "38cc75876757aee876f4b7a459793f349f5c8aadeda626cb7a64bd596d50f9c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ia/firefox-120.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "6fda520cb8df890a9404c6a71fe0ab813e7b563d2d084bd4cd77817d89e56271"; + sha256 = "7c99f7cc607bff519fc251f792f46c8c171f04febcf5b72a4a2c36df6c212e0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/id/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/id/firefox-120.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "38f2a22dc6d96e52130141982c7862136d001e8bbbe9f337391019c34690b126"; + sha256 = "fd0120401c964cbe4505c6f56433da264c885319545f3ba12a18c79393c5eb0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/is/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/is/firefox-120.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "1405bdfbd59b3c4c8800f4191f1bde2f47096a37adf8f66d6d3fc881c93ca161"; + sha256 = "51c7c492ba3b38692e087c069d06f611e7e4286986c81dd759f6dd6ef98d2033"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/it/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/it/firefox-120.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d8edde64459325e81b51eb197de89018d107e427963381dec0a5ad54803ef258"; + sha256 = "eb5a21f3b6100fed5324bb39b2e4a2f4733744c19c17d050f805f9626b7a8535"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ja/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ja/firefox-120.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9c2bc20554ec009fad6bc7e0904f732fffb2f6efc2de1314ea7660547ed2b085"; + sha256 = "44c9d827f5389a4953838ce988d0ac2ac94e28c7b856bcdbb061727741626679"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ka/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ka/firefox-120.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "86a9e9100b0a482b4829bce83160a4a4adb06b7b91fd91a55004f7418e8949db"; + sha256 = "8684241c4b9bebb733c6ff0f0753ab39946a077e53eb266b00c52469f63a6e69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kab/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kab/firefox-120.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "30a17adf1a960c5470d44a2cce09dcf804831d9cfba332c75d1b77655af95b70"; + sha256 = "00e607abd9c18db021cf6579ebfde99e69c2074e6c3c37fd8e1babb11cd8da72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kk/firefox-120.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3bde81c8d3e371eeca249b48a994fd2fc9f478ac6309f0ee5283a8425b30db05"; + sha256 = "a95590b17f81572d61d9f4953c912cf6d01d2bc269ab69ca76c2718361679810"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/km/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/km/firefox-120.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e05a943bb6b2c09982540cae733e81f1a9d363958a68040ebd657da5ac04845a"; + sha256 = "8cb890b9f00dcc3b5941a637bfd7e9870bc8315880559e305c28a890b180ab09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kn/firefox-120.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "17e9357334834134002f710f61db6c609240b35ff9f5116bffbb01488997aab9"; + sha256 = "2c2f1b23b96d92af24167bb1b15208c83830d6bc8e1445834cea18909885ce85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ko/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ko/firefox-120.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2065b72bf7e8dad9852d8f5471bbb37241cdf6d43594cca3eb41c4c4d58aeee6"; + sha256 = "f0c91c806c72764d8c3a0a8d4a53c2f2d8887159c67915c705a67c55d5051d76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lij/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lij/firefox-120.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "4dc2aef6ad9477c9708db994956485fb006264efb300f489fd4fb4ee25f8847d"; + sha256 = "9ade5925615bbbbf67a5a7c4c9981237b3326379aa796e4f624775482bbd0b57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lt/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lt/firefox-120.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be49d7c71c76dfd36f8589388ce977c915780dca80b239b0731df86afdf0b669"; + sha256 = "6d3e072044a71a8c468728d01a6124cadc31b3b751b21a56d09781dfabc7d464"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lv/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lv/firefox-120.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7939ebb3c3965d4db86be9516833d36968448ab188734ef7991f47c7dc307ed9"; + sha256 = "088066e9f092405346b21c5b29bf250a667c9118a69d4715dd31eacbe8289c1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/mk/firefox-120.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "e37c008b774c8e4774bba59a25a29d8df2e63132db6e0762a00da60f7d374f57"; + sha256 = "073dbc445a4bd79c750d8088524aaabc428ea3f87cf4237d6c26459d558b9a2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/mr/firefox-120.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "fe38e4ee96783f3df61d92b0405e447286ba9a85ca84e048621e3c24cfa04166"; + sha256 = "84f9a9f15c9d4baea7ac5e7978a9515ae695aca736af063840ac17c840e8419a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ms/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ms/firefox-120.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a0429e6ca5bfbcc297212defbca30218fe8e91a33feedef01ee99a339d7bd63b"; + sha256 = "657baafe8d91ef103977a7aeafe62e072b2c385025689195fc4f11d2318375ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/my/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/my/firefox-120.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "fb138fd185638cac7be3de34f402b2810e2a133b322a9d254ef8ee9d9294d208"; + sha256 = "a1e74c3e264e00cf9fc65527766be4e59bfb9c647d3148e538395f3f44f13cea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nb-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nb-NO/firefox-120.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "fc3e5f37199302836c7fbbb4747fc3a016486d3aaf632f0e79272a4c96a59143"; + sha256 = "676ca8c99a8d8c81579a914773b4b4370a09e713056bcf67107743f040bbecad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ne-NP/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ne-NP/firefox-120.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "978478460a0498d9a10dc118545823bccd3a52d7dce88f36badbb0df08550696"; + sha256 = "e3cfbb9b969e0483525bca8f5d92e9cfb4cf7468e92e97a89d6ccbab14659475"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nl/firefox-120.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "67930465d612df84ab140ac66d185077f8ee314290daaca9c6fcdcba5f21c817"; + sha256 = "b8cba7e4eea5b521f01d3eeea05ffc73b8cd5fb5000a8d82882c85998ca28a0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nn-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nn-NO/firefox-120.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "81e478f2307b10cb71854614f089518213d061d1e122e6ae6cf3beb6b5c84c50"; + sha256 = "d25dddf1966ba1e109647d52aa6ffd4ae34bed4fc8d95ed1e1f2ceb8ca115faa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/oc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/oc/firefox-120.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6cfec951a0b99743ab2dc521d27bffb50ce2bebff2de6196c30f33eab5187c1a"; + sha256 = "413813ac356cbac6defed52fc2eaa6549bf6a374d3c5bdf7c23705ebf67db594"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pa-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pa-IN/firefox-120.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6c7b6f3c5a0f871395d13285ca5a4bb0c0415726cf9909fd86151c014f770c2d"; + sha256 = "af1e7bc5fa2c0ee798d1897c9de9102ec80f825df942152d8f3ecaf96b30e915"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pl/firefox-120.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "44b28cdb9f11948ea6f00801f988a21a2df943b17b88292703de5641abe6b471"; + sha256 = "a6a88455cc8044c204e7797bfbce7c6287a8b95aff3e0476a40a887530d657d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-BR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pt-BR/firefox-120.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ba8db08a40fb15570b954da9b5b6e7cddf3138cbd540ba6fd221a2d3d2d9b544"; + sha256 = "28b71c9d3a8b71addbb5e25a24339277cea7a377b2fb0c84dec7fcfc099f80bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-PT/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pt-PT/firefox-120.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8518cc89f5d0a8f0a714c3d15b1ae0dbbaa6c1dbb47b766f98e706ee5c9fea8b"; + sha256 = "e9f222a3e0f060c9f0fc2f3f4b7ea41f72f281f9021dfce5256dd74a0844f408"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/rm/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/rm/firefox-120.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "56fe885cbdf01c1c53e0bcdaa74fe8a9b2fd075d4050a197fbe872dfe1f3fd1c"; + sha256 = "eb689283673b655a6960d0b38c86d0bcaba991031e7bd3cc81e1ffaf62321082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ro/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ro/firefox-120.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "94474a1992ef8d0cddb85e698375d7df43736325e28ae2e60f94299a9cff5079"; + sha256 = "b7be6d7ff81f3d4f9bc63aadc5f6724e900811a2fb83c1649c73b4b11f06cdb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ru/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ru/firefox-120.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f9e70b1b61c47850804f9dd4c8a907ff81599b95477893c42e4f6a0e6588092c"; + sha256 = "42c5a27358521a2ad1f90d76291c177e059c0bc78a7cf584f0001c171e3af773"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sat/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sat/firefox-120.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "e2bd85382eb4bb006518e7a37692e4b11d33bcbddef43fe1636465a94f13d07f"; + sha256 = "3d8f23c32bf09d082bff8a8e07154efa0f0210463718a1bf17d498a7f2b4f879"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sc/firefox-120.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "e3b7d6a2d10f9da0b11fc01128ad1cc3c878e90260bb906b1ec451f8c0160b36"; + sha256 = "4cc1ec00e153f85182eac844bf6c502172fd649e5cd19e8d618839bba9e7246d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sco/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sco/firefox-120.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5c20827498ba6ab0ea1b6299796479ab3af2685d64248166c4aeaa34283837d5"; + sha256 = "b71fc4af5b153ec3e4da3db6ebcd385abe8b6a955f96f2793c480cc43078b417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/si/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/si/firefox-120.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1d6ac6db81135b96f5940eae2b14a375ff636b0ccf5163e7ba198739a35c977e"; + sha256 = "1b7d26cb1ee71c05a8a113df8c6ef9918aae9955a05ae0d906f3ab9076de6eff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sk/firefox-120.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5f1cc60c2fe7ba2e184de94ea3552a84acde3bc438dae2afbca245af27ea1060"; + sha256 = "2bdf7ec91a936b81537930c3bc930bf8834460d0cff36db0f18449ce68786e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sl/firefox-120.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3942f5597ee26764f55eb1b5fd8a3ef656b94ed4630067042ae3d6cdc35a4a8f"; + sha256 = "a90210e59f2afda7b59518d774de6c2fb9f138a01091cad03492ed02db2c0a22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/son/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/son/firefox-120.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9a0aad56e659f09f65804682d902767beda5955215f794c3b07b0a94a0ec628d"; + sha256 = "fc8c11313be82e4de14de176e2610c10b7aa7ec2f193f5a879a731ba54839957"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sq/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sq/firefox-120.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a3739cdfd849de74b021dde0aeea27eb0dbbf1a04f0481ff4adaf7eee4fdb615"; + sha256 = "344f7ebd334d4abdfdcf259f770309f5d8dd748cdf865efdc4d871a328c4dd39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sr/firefox-120.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "68a0ace6dfc11e82c7e5ebe918a4d5c975897beb0f0727a2114089e2eafc077b"; + sha256 = "84e7a59e98afcfe6e14948c937c446f060cebe87b70a852baa0cb40bba55e5fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sv-SE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sv-SE/firefox-120.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9a67bd82f39e4af0801b24f88f6f6bf92ba5d85031de2098fef6b2b9d3593863"; + sha256 = "f0678a5c33b960912457fa6619228659cdbb8a35a98a7b783c03b8c52fcf6e6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/szl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/szl/firefox-120.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "7a4da1bbd23268b52d82fefaeaf67f03d11e3b295d5811107de8731269ce98bf"; + sha256 = "794046dd28fa390ff8ec62576d37dbbd53ef561f24084ccd385b6ff2f1324fd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ta/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ta/firefox-120.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "e29cdd9028f07d00853d5c29a574d281218be9c13e2fe0cd8b53b17cb6c1b006"; + sha256 = "f78369a5bed86718908c927d3ac91b94096e0932b89903fca3ca353089ce6102"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/te/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/te/firefox-120.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a34da2975dca94013bf7152ca9d3029f63fd48be602088cae64d3eba844029a7"; + sha256 = "664ed5133a28e8715019a0f890086f6627ce6887f23b0e1997b7fd3e5b3a1665"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tg/firefox-120.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "4602903e4dcfb4ee14fed515188ef7856f30bba9b7d7a0ee3e3674e9242e9e03"; + sha256 = "81e960ef12b82ae057f21bac6695fcb8609afba040542e0792de9692fe543524"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/th/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/th/firefox-120.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "805072c3cfd004060f20334a468467bd7c372df415f24df35e97a1309f2aec13"; + sha256 = "b07d2c4d795a7d5829b375573a562ed23a503d31ff914d2a05edfff381de3674"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tl/firefox-120.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "8a0da3f8c4aa05db9e08c4bb95587a1347a38fc15a5d500569cdaba77a8f0899"; + sha256 = "14cc86f160b201ff66dab3f54fe0604b099fe4ed4cacfb3c8c5420fb75aea05c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tr/firefox-120.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9fe74282a7bf0612e6172dcc54a5a65915b1d30fd5a1d18f193a617a5be6ea1e"; + sha256 = "a3c6e8ca647ff56f8447f148f28c9afacba8446cb17165be7a1d8ad38381c1c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/trs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/trs/firefox-120.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "99056931998947015e7fef2cbc432dd0ee565d2c612e0a35b2848f06987cc322"; + sha256 = "2d517436bb9b417882a362037ab0a096a1e25e7c3f7a40e68e564c19e9eca947"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/uk/firefox-120.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4ed96af94b077ae2a660f10c2786344da83ec513706177793a427b2bd943332f"; + sha256 = "144da484cd8cde4f50dee471b8299de445932fd1f0cc4585a00533ac0fe3114e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ur/firefox-120.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "bb45d5109de54888df1c051d6692f337b87cbccf897f0b3a6ee475ef9bef9e8b"; + sha256 = "3417edecd2eb4735a48a0e71429cc866a9b15e37d7fec99ecea793e83072028f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uz/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/uz/firefox-120.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9e053e07a72afb8fa4975f06e3fdcfe52c85777a91f0262e8008fbd906c4a46f"; + sha256 = "cf1a58caf9c3e03435923e4bc368d4d95496793187db7cd2f1d0da81be962a57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/vi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/vi/firefox-120.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5369cebbc2a94c29971f53a50b77666845233982d9fee050ae5111440a12d276"; + sha256 = "d8a1eee3e1fc31d70c86a4879e1977c88ea92abf58e7117936e6f9b9ca73e34d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/xh/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/xh/firefox-120.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "868c5ae9ec6c5f2efba92e84f5112e560bb3a1bf44d76dd90abcbf00fe19f1e6"; + sha256 = "626cdc3529f9304d6e37c9885f57d77d11db4c633462e746975158d465933a33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-CN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/zh-CN/firefox-120.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4ce3f1ff7ea8b8a6d0af2fefd05c7647adbfa6feafcd788a38a1f149b2dcfb26"; + sha256 = "4a8c35174fc46de73257d4c75dc3f43f85cf56961b9e80464cbbe5da2b13f8a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-TW/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/zh-TW/firefox-120.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a91f8b78ed240ca818661baedabac14cb646a8396a9983d46fb3a3df556a102a"; + sha256 = "2fabc12704373d685862155e8869e078dd819c99f286eeef6f8de20de740fd59"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 5542ca62b93a..4396d7e85d41 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -225,36 +225,26 @@ buildStdenv.mkDerivation { "profilingPhase" ]; - patches = lib.optionals (lib.versionAtLeast version "112.0" && lib.versionOlder version "113.0") [ - (fetchpatch { - # Crash when desktop scaling does not divide window scale on Wayland - # https://bugzilla.mozilla.org/show_bug.cgi?id=1803016 - name = "mozbz1803016.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb"; - hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA="; - }) - ] ++ lib.optionals (lib.versionOlder version "114.0") [ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1830040 - # https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8 + patches = lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [ + # dbus cflags regression fix + # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12"; - hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A="; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/f1f5f98290b3"; + hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI="; }) ] - ++ lib.optionals (lib.versionOlder version "102.13") [ - # cherry-pick bindgen change to fix build with clang 16 + ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch + ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch + ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch + ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [ (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/firefox-esr/bindgen.patch?id=4c4b0c01c808657fffc5b796c56108c57301b28f"; - hash = "sha256-lTvgT358M4M2vedZ+A6xSKsBYhSN+McdmEeR9t75MLU="; + # Do not crash on systems without an expected statically assumed page size. + # https://phabricator.services.mozilla.com/D194458 + name = "mozbz1866025.patch"; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951"; + hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM="; }) - # cherry-pick mp4parse change fixing build with Rust 1.70+ - # original change: https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 - # vendored to update checksums - ./mp4parse-rust-170.patch ] - ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch - ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch - ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ extraPatches; postPatch = '' @@ -508,9 +498,6 @@ buildStdenv.mkDerivation { preBuild = '' cd mozobj - '' + lib.optionalString (lib.versionAtLeast version "120") '' - # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; postBuild = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch deleted file mode 100644 index f7a9cb773455..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -r 22fc47c968f2 toolkit/xre/nsXREDirProvider.cpp ---- a/toolkit/xre/nsXREDirProvider.cpp Mon Dec 14 15:09:17 2020 +0000 -+++ b/toolkit/xre/nsXREDirProvider.cpp Tue Feb 23 23:38:56 2021 +0100 -@@ -11,6 +11,7 @@ - - #include "jsapi.h" - #include "xpcpublic.h" -+#include "prenv.h" - - #include "nsIAppStartup.h" - #include "nsIFile.h" -@@ -305,7 +306,8 @@ - "/usr/lib/mozilla"_ns - # endif - ; -- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); -+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); -+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir)); - # endif - - if (NS_SUCCEEDED(rv)) { diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch deleted file mode 100644 index 9786c85df0cc..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/third_party/rust/mp4parse/.cargo-checksum.json -+++ b/third_party/rust/mp4parse/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"73114a5c28472e77082ad259113ffafb418ed602c1741f26da3e10278b0bf93e","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null} -+{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"a88d6cc10ec1322b53a8f4c782b5133135ace0fdfcf03d1624b768788e17be0f","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null} ---- a/third_party/rust/mp4parse/src/lib.rs -+++ b//third_party/rust/mp4parse/src/lib.rs -@@ -3184,8 +3184,13 @@ macro_rules! impl_mul { - type Output = $output; - - fn mul(self, rhs: $rhs) -> Self::Output { -- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64); -- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX); -+ static_assertions::const_assert!( -+ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64 -+ ); -+ static_assertions::const_assert!( -+ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX -+ <= <$output as UpperBounded>::MAX -+ ); - - let lhs: $inner = self.get().into(); - let rhs: $inner = rhs.get().into(); diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch new file mode 100644 index 000000000000..999d0bd8e7f3 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch @@ -0,0 +1,27 @@ +diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp +index cfbc39527b02..9327631a79c5 100644 +--- a/docshell/base/nsAboutRedirector.cpp ++++ b/docshell/base/nsAboutRedirector.cpp +@@ -88,9 +88,6 @@ static const RedirEntry kRedirMap[] = { + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/aboutaddons.html", + nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | +- nsIAboutModule::IS_SECURE_CHROME_UI}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn +index ed7c2ad3fc30..ff54456a6582 100644 +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -41,8 +41,6 @@ toolkit.jar: + content/global/aboutUrlClassifier.js + content/global/aboutUrlClassifier.xhtml + content/global/aboutUrlClassifier.css +-* content/global/buildconfig.html +- content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml + #ifndef MOZ_FENNEC diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 37777f92005d..f43eaab9fa00 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,12 +3,15 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "119.0.1"; + version = "120.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a"; + sha512 = "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c"; }; + extraPatches = [ + ]; + meta = { changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/"; description = "A web browser built from Firefox source tree"; @@ -30,14 +33,15 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "120.0b9"; + version = "121.0b5"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "7ac5562ce393ea84663eac5c6ee1a0ca527ff4a8a9ec6aaaef37213ff071076846949e80af21d95ec8e32d3cbc740b772a9d7cc54965b7bbc8e015da22ae927f"; + sha512 = "1c9d2e8fe32687e95af5cf335ef219e70847977568ca636a322c2804f6408d054236df4196e03fc666ac3245ca4a3a9785caf56e1d928a1850f4b34ab5237f8c"; }; meta = { + changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/"; description = "A web browser built from Firefox Beta Release source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ jopejoe1 ]; @@ -58,16 +62,17 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "120.0b9"; + version = "121.0b5"; 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 = "07bf1a58550e70c683719adef55fa3d1ee06876e0cb086c28242879c683269c4aa784b1dce639218b3ad24a546192088fe5224a52e13a0086f205ec5470e2428"; + sha512 = "cf23b18abece88f4cee418892791a8a4076ccc14cfe0f1d58f9284ec72f109e44a5397a88b4350f963a3e02e53dd91d7b777c36debd9a3621081499519659f6e"; }; meta = { + changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/"; description = "A web browser built from Firefox Developer Edition source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ jopejoe1 ]; @@ -89,11 +94,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.4.0esr"; + version = "115.5.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3ee680c5c503df7e4913794b7029ccffc10889f8f259f16030b24c1c18c1528439123532374ccb3a7e7a0d5d64068949cb85638a29694a7d99b74dd403ddefdc"; + sha512 = "5ee722884cd545cf5146f414526b4547286625f4f5996a409d7f64f115633fb7eb74d202e82f175fd5b2d24cce88deee70020fcb284055fcdea3d39da182074e"; }; meta = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 25c7ac5bb659..dcb8923c423c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ , jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ , browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -66,7 +66,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` instead" + lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts.packages` instead" [pkg] else []; @@ -87,7 +87,7 @@ let libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire - ++ lib.optional ffmpegSupport ffmpeg_5 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix b/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix index a4796d93954a..9b90f94dbcac 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,17 +7,19 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.5.1"; + packageVersion = "11.6.0"; applicationName = "Floorp"; binaryName = "floorp"; - version = "155.4.0"; + + # Must match the contents of `browser/config/version.txt` in the source tree + version = "155.5.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-988jKyfIGZ2UPHTNO1cK2lxR/5j3U/QYR3ZI9WsvHUI="; + hash = "sha256-5OQZckST6l9OZ7jnj52nuALCWiH1hVdDoDHSpqwUUfA="; }; extraConfigureFlags = [ @@ -43,6 +45,7 @@ tests = [ nixosTests.floorp ]; }).override { privacySupport = true; + webrtcSupport = true; enableOfficialBranding = false; }).overrideAttrs (prev: { MOZ_REQUIRE_SIGNING = ""; diff --git a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 9f778ed50082..6375e074a34a 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.17.3"; + version = "1.17.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-YPC+mwXKZOOhLtUU+WHdkQtHFYfIYOiadbuAHLvAXxM="; + hash = "sha256-vzdlcyA+RCr8RH0KbTiUah8lS++Xq6gLCHbgHHBFEig="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index afe766f841bc..9662b1b54e0d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "119.0.1-1", + "packageVersion": "120.0-1", "source": { - "rev": "119.0.1-1", - "sha256": "1ghxrylxrb5i37i4z2hrb8dn9lndhs75pjvhdafg079jmar5wfn7" + "rev": "120.0-1", + "sha256": "1wms3kyimmfzl64rbphgap2sm87lwkl0pr24rx4rxf3px3bq97f3" }, "settings": { - "rev": "095f50ed91aa7db2de9c67763cf46bae09146a58", - "sha256": "0nwrzcqxa72wcbxjbilxl340i69m5l0qr7gq2s6a76bbzxg502gi" + "rev": "b587388bdbe63511c478cb8b5f82c2e80040414c", + "sha256": "03cw6wh7358pgld4qgs534pl2lnfvwc0xl2yyb3n3pyvmba6cyrp" }, "firefox": { - "version": "119.0.1", - "sha512": "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a" + "version": "120.0", + "sha512": "31d5f9e1d4173280c8de6d9b8551bc6bba5e2c49b84f944f50d42002d5b39c2fb743bc130f26c81160388a102b8301b94a0a378ecdfa6f943860f971a860df8c" } } diff --git a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 3577c2a12b25..12ef901bbcb3 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -1,4 +1,4 @@ -{ channel, version, revision, sha256 }: +{ channel, version, revision, hash }: { stdenv , fetchurl @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ @@ -129,12 +129,12 @@ stdenv.mkDerivation rec { opt/microsoft/${shortName}/libGLESv2.so patchelf \ - --set-rpath "${libPath.libsmartscreenn}" \ - opt/microsoft/${shortName}/libsmartscreenn.so - - patchelf \ --set-rpath "${libPath.liboneauth}" \ opt/microsoft/${shortName}/liboneauth.so + '' + lib.optionalString (lib.versionOlder version "120") '' + patchelf \ + --set-rpath "${libPath.libsmartscreenn}" \ + opt/microsoft/${shortName}/libsmartscreenn.so ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index d034c68d85fa..51b3d6730862 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "119.0.2151.44"; + version = "119.0.2151.72"; revision = "1"; - sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU="; + hash = "sha256-thBx/+6thNXXKppA11IOG5EiMx7pA9FA3vSkwa9+F0o="; }; beta = import ./browser.nix { channel = "beta"; - version = "119.0.2151.44"; + version = "120.0.2210.22"; revision = "1"; - sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc="; + hash = "sha256-GayVVZbtGLQmmXu+k4wdsD+rPwGiSPHnQwzVYyKWhHM="; }; dev = import ./browser.nix { channel = "dev"; - version = "120.0.2186.2"; + version = "121.0.2220.3"; revision = "1"; - sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM="; + hash = "sha256-M3r+SLp3lQ7oWDYoM7aNZDC5wbMxFZggsu0Iuyyw/cw="; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py index f32b669f0360..616dc0999505 100755 --- a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -52,7 +52,7 @@ def nix_expressions(latest: dict[str, Packages]): channel = "{channel}"; version = "{version}"; revision = "{revision}"; - sha256 = "{sri}"; + hash = "{sri}"; }};''' ) channel_strs.append(channel_str) diff --git a/nixpkgs/pkgs/applications/networking/browsers/moonlander/default.nix b/nixpkgs/pkgs/applications/networking/browsers/moonlander/default.nix deleted file mode 100644 index 94bbbadecc91..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/moonlander/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, rustPlatform -, atk -, cairo -, gdk-pixbuf -, glib -, gtk3 -, pango -, pkg-config -}: - -rustPlatform.buildRustPackage rec { - pname = "moonlander"; - version = "unstable-2021-05-23"; - - src = fetchFromSourcehut { - owner = "~admicos"; - repo = "moonlander"; - rev = "abfb9cd421092b73609a32d0a04d110294a48f5e"; - hash = "sha256-kpaJRZPPVj8QTFfOx7nq3wN2jmyYASou7cgf+XY2RVU="; - }; - - cargoHash = "sha256-DL/EtZomrZlOFjUgNm6qnrB1MpXApkYKGubi+dB8aho="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk3 - pango - ]; - - meta = with lib; { - description = "Just another \"fancy\" Gemini client"; - homepage = "https://sr.ht/~admicos/moonlander/"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 28f8358feb5c..5794a04489da 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -6,12 +6,9 @@ , makeWrapper , writeText , wrapGAppsHook +, autoPatchelfHook , callPackage -# Common run-time dependencies -, zlib - -# libxul run-time dependencies , atk , cairo , dbus @@ -30,19 +27,31 @@ , mesa , pango , pciutils +, zlib , libnotifySupport ? stdenv.isLinux , libnotify +, waylandSupport ? stdenv.isLinux +, libxkbcommon +, libdrm +, libGL + +, mediaSupport ? true +, ffmpeg + , audioSupport ? mediaSupport -, pulseaudioSupport ? mediaSupport + +, pipewireSupport ? audioSupport +, pipewire + +, pulseaudioSupport ? audioSupport , libpulseaudio , apulse , alsa-lib -# Media support (implies audio support) -, mediaSupport ? true -, ffmpeg +, libvaSupport ? mediaSupport +, libva # Extra preferences , extraPrefs ? "" @@ -74,11 +83,14 @@ let stdenv.cc.libc zlib ] ++ lib.optionals libnotifySupport [ libnotify ] + ++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ] + ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals libvaSupport [ libva ] ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.1"; + version = "13.0.4"; sources = { x86_64-linux = fetchurl { @@ -90,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-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ="; + hash = "sha256-qK67rf9zkMA53WFIcMCsPUH4m6YkMVqAUsHiGsy/xN4="; }; }; @@ -113,7 +125,13 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook autoPatchelfHook ]; + buildInputs = [ + gtk3 + alsa-lib + dbus-glib + libXtst + ]; preferLocalBuild = true; allowSubstitutes = false; diff --git a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 04de25c4988a..c8b315893a52 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -26,14 +26,14 @@ let stripRoot = false; }; - pname = "qutebrowser"; version = "3.0.2"; in python3.pkgs.buildPythonApplication { - inherit pname version; + pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5"; + inherit version; src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix index caa4b6e39a59..ce72abe79e7b 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -2,12 +2,9 @@ , fetchurl , makeDesktopItem , writeText +, autoPatchelfHook , callPackage -# Common run-time dependencies -, zlib - -# libxul run-time dependencies , atk , cairo , dbus @@ -22,14 +19,33 @@ , libXext , libXrender , libXt +, libXtst +, mesa , pango +, pciutils +, zlib + +, libnotifySupport ? stdenv.isLinux +, libnotify + +, waylandSupport ? stdenv.isLinux +, libxkbcommon +, libdrm +, libGL , audioSupport ? mediaSupport -, pulseaudioSupport ? mediaSupport + +, pipewireSupport ? audioSupport +, pipewire + +, pulseaudioSupport ? audioSupport , libpulseaudio , apulse , alsa-lib +, libvaSupport ? mediaSupport +, libva + # Media support (implies audio support) , mediaSupport ? true , ffmpeg @@ -58,35 +74,39 @@ lib.warnIf (useHardenedMalloc != null) "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues" (let - libPath = lib.makeLibraryPath libPkgs; - - libPkgs = [ - alsa-lib - atk - cairo - dbus - dbus-glib - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libxcb - libX11 - libXext - libXrender - libXt - pango - stdenv.cc.cc - stdenv.cc.libc - zlib - ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ] - ++ lib.optionals mediaSupport [ - ffmpeg - ]; - - version = "13.0.1"; + libPath = lib.makeLibraryPath ( + [ + alsa-lib + atk + cairo + dbus + dbus-glib + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libxcb + libX11 + libXext + libXrender + libXt + libXtst + mesa # for libgbm + pango + pciutils + stdenv.cc.cc + stdenv.cc.libc + zlib + ] ++ lib.optionals libnotifySupport [ libnotify ] + ++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ] + ++ lib.optionals pipewireSupport [ pipewire ] + ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals libvaSupport [ libva ] + ++ lib.optionals mediaSupport [ ffmpeg ] + ); + + version = "13.0.5"; sources = { x86_64-linux = fetchurl { @@ -96,7 +116,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-ORa973US2VY9Can4Nr35YSpZrYGqBP4I/S/ulsbRJLc="; + hash = "sha256-WZq8ig62Mu3q6OrVSaPbe6MLQ6pvFNo3yQMXC7PCGJY="; }; i686-linux = fetchurl { @@ -106,7 +126,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-OBUleXLTNFG+aFuftnphgBtQCfyoIWDcoVFs5elJ0tA="; + hash = "sha256-/enIdKLMRmJIjwXEo0i3hgHZKEtWaBgFzE1rtZMsqeY="; }; }; @@ -129,6 +149,14 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ + gtk3 + alsa-lib + dbus-glib + libXtst + ]; + preferLocalBuild = true; allowSubstitutes = false; diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 2ce73facf61e..e870ab51c879 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/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.2.3105.58"; + version = "6.4.3160.42"; 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-PDy+cenU1D9UKlICgZgj/KKZFq5x8iSDpbtCr06ks70="; - x86_64-linux = "sha256-uWv4odg/nEuY6B8Jzt5Br4pUFMlG0vGEt968PajxMUA="; + aarch64-linux = "sha256-DQXlINbgZmYdmrp/VeWloWFk2REPMyWUaJkMVl0wDho="; + x86_64-linux = "sha256-udzdWNG0B9SidaOPsAOzkoviB3kwjaNCPZkSSIpLXNI="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/nixpkgs/pkgs/applications/networking/calls/default.nix b/nixpkgs/pkgs/applications/networking/calls/default.nix index 0401f1a56876..3546284f99c3 100644 --- a/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , libhandy +, libsecret , modemmanager , gtk3 , gom @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ modemmanager libhandy + libsecret evolution-data-server folks gom @@ -110,5 +112,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ]; platforms = platforms.linux; + mainProgram = "gnome-calls"; }; } diff --git a/nixpkgs/pkgs/applications/networking/charles/default.nix b/nixpkgs/pkgs/applications/networking/charles/default.nix index 27fa0981f170..27c5ebf9e9c0 100644 --- a/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -75,5 +75,6 @@ in { version = "3.12.3"; sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; jdk = jdk8.jre; + mainProgram = "charles"; }); } diff --git a/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix b/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix index 7f11ec257038..2be03621a016 100644 --- a/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix +++ b/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix @@ -56,5 +56,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/kissgyorgy/cloudflare-dyndns"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; + mainProgram = "cloudflare-dyndns"; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index b0b7e8a08eb4..6417ebca951a 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-3MwSiI21j2tMqdDInK7Q+QDMiFCophJyNXMOXMwJeEQ="; + hash = "sha256-njYfkEt3vQRUOeH1g/W7oY0MI3+D8stQ6ZRtq8lRn0g="; }; - vendorHash = "sha256-Zh/r4/+x67C1yXGW/R+FYKiGFaGPEV//Sg9cWwVIMxI="; + vendorHash = "sha256-XDDZeJVBWJph/8yGxX6x1WTTM2cWaB5gK+eZz0i7s0k="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix index f33d11a4c9a4..aaf76d727c62 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.68"; + version = "1.0.69"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-qvcMA8oPDyi8WoIzr/3mu+2cHDXn5rgLUmnsGdOQXVM="; + sha256 = "sha256-gecvS7Vwg1TQTjbDsKrwnf5/eA7XOnIvb6xw8MZDUkU="; }; - vendorHash = "sha256-C+XaX78iGKw6Ll7PMPFWWAy6fRwjrmbLhFdmqJPMrxc="; + vendorHash = "sha256-cJIdF+zujftCIBzzzUpXLUWXCP4+n+gSaPJsatEQuOs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 2204a9405027..84f0e5188466 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.4"; + version = "8.7.5"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-W4+2ugRSSP3HgmyQJKGCPMX7cmE7Fk3iovBOgBen+q8="; + sha256 = "sha256-saGtll+feAZ3eQGMHN4XcI+eSkfniTfsEHNN+tABmR4="; }; - vendorHash = "sha256-klbKL/c7L7kHPadDa/FkpuAgHYQmuLQK6yFhph52KsU="; + vendorHash = "sha256-OjgZHN/57CmWmpOXqRFVf+duVCy26hg4lbSkDHgsV44="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix b/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix index 00816c0203ee..3926feebfc04 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.13.3"; + version = "3.13.4"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-kLDriWkzOX4mC4VTpkyEtMTpOSoR0BsCwVeWLCfaY5w="; + hash = "sha256-h6GxU7y6z5wyZjuK7wI6BG0aF2u6hqLsID7ijTNzifc="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index f9d95627f765..97d5ef2d02e9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - hash = "sha256-2h1Pc313JZ/2NkFOOQnIrhe1Pm8FJ/BvxjAQhs/eSK0="; + hash = "sha256-btrnfL9U8k7jwo6ltVfbiSJFCX52zjfgf4E+IsWTYi4="; }; vendorHash = "sha256-E+7ndvXWzsU896/eWyupbvqkLed2ly91osptZKT79fk="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 66463152800b..8967550b4d0e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.158.1"; + version = "0.159.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ohf8MUUTZ3YNon12QpSRE80RaHvWsbrZk/slgEVbgoo="; + sha256 = "sha256-7RFDa8Yw2tPjVvJLVPb7VbDNhrHNxzqmE0uogm7X/HY="; }; - vendorHash = "sha256-rA8egwzvvhArQboWpH2ZZTSJGTyzHUIl6aLusPfr8tw="; + vendorHash = "sha256-kVr6h5u71RimRER6tNxZUewSqqjaAPptriD5bfsE85U="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix index d3ff99358af2..1acca4d0e101 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-21.2.1+up21.2.0.tgz"; - sha256 = "05j3vyikb7g2z2i07rij9h4ki5lb2hb2rynpiqfd4l1y5qm0qhw9"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; + sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-21.2.1+up21.2.0.tgz"; - sha256 = "0gvz0yzph2893scd0q10b938yc7f36b3zqs57pkjgqqpl1d0nwhg"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; + sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index df84a0a95d66..abe8e933d11e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.27.6+k3s1"; - k3sCommit = "bd04941a294793ec92e8703d5e5da14107902e88"; - k3sRepoSha256 = "04chr8gp0yprihigy1yzhvi2baby053fav384gq0sjq6bkp3fzd8"; - k3sVendorHash = "sha256-LH9OsBK0Pq/NGEHprbIgYKQsslYdR3i4LYVvo5P0K+8="; + k3sVersion = "1.27.7+k3s2"; + k3sCommit = "575bce7689f4be112bd0099362fb8d5f2e39398e"; + k3sRepoSha256 = "1k8hmxdc45pxwkpkq3y1jpx1ybv1h9y4sk7zb09y0487jqqgd15f"; + k3sVendorHash = "sha256-IqnBau4uBIN8ccnoX1P3ud8ZoMR3BjhchLU32tq0YWQ="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sCNIVersion = "1.3.0-k3s1"; k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; - containerdVersion = "1.7.6-k3s1.27"; - containerdSha256 = "1kzjqw56pcdpsqdkw2k5a3pnpf8n93dh4jc2yybgqz3nyj4fw0a8"; + containerdVersion = "1.7.7-k3s1.27"; + containerdSha256 = "1v1hzjcd8ym3nf7bb88z4n8q1g7gawrkp0j82ah80ars40mifhan"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix new file mode 100644 index 000000000000..1acca4d0e101 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; + sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; + sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/versions.nix new file mode 100644 index 000000000000..960a5b2ad846 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -0,0 +1,14 @@ +{ + k3sVersion = "1.28.3+k3s2"; + k3sCommit = "bbafb86e91ae3682a1811119d136203957df9061"; + k3sRepoSha256 = "0vbkz8p6bf32lg4n3p5prbghi0wm30nsj6wfmyqacxzzmllqynyk"; + k3sVendorHash = "sha256-DHj2rFc/ZX22uvr3HuZr0EvM2gbZSndPtNa5FYqv08o="; + chartVersions = import ./chart-versions.nix; + k3sRootVersion = "0.12.2"; + k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; + k3sCNIVersion = "1.3.0-k3s1"; + k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; + containerdVersion = "1.7.7-k3s1"; + containerdSha256 = "08dxafbac31s0gx3yaj1d53l0lznpj0hw05kiqx23k8ck303q4xj"; + criCtlVersion = "1.26.0-rc.0-k3s1"; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index e2ba162b7581..9611f3770e09 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -20,4 +20,9 @@ in k3s_1_27 = common ((import ./1_27/versions.nix) // { updateScript = [ ./update-script.sh "27" ]; }) extraArgs; + + # 1_28 can be built with the same builder as 1_26 + k3s_1_28 = common ((import ./1_28/versions.nix) // { + updateScript = [ ./update-script.sh "28" ]; + }) extraArgs; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix b/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix index e4bd3be1e78e..2dee8f6fb148 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-SHijhYZyvaBkRVt0BO37OXEjaDGUIeO+PfrmUqPJf/M="; + hash = "sha256-D0BsjAZ7yhbZ8dJ3U/K2tdKhLTZBmK/HorApSYVb3ww="; }; - vendorHash = "sha256-fxbyAd2NaU1WQCPE+Feb1mrz6dzwCyZqanm+wfBL/IE="; + vendorHash = "sha256-vCcdQt8/jkUQVz0SpjWUhiJd7d3ePIF6qLD8NKCc618="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix index 76f81be00ea5..611a33ca8f73 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tu1hAWAqnTGq9NL0kjG2VGzSKDh55HyAoa0nhsJdNLw="; + sha256 = "sha256-PUZ3zwgOQ362ikoX1D7SLThiaFpXJh9TKOdjZqZDtSg="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 3af7a5990826..0d8512788d7c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-nDLdATiUcg5o86Pda1/Do9dPMtdNCUo/xj6ERRzih8w="; + sha256 = "sha256-Lm7TrdUAYPYBKC+9lPmWTDp0BQqiAc/A107wtiGDwZ4="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index 36fcf3dd2398..102776de5283 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-izUjiRQAdTpdk86s1lQwLfpHy4eJo3mGAgTwWfGkNAQ="; + hash = "sha256-rqZieQdUsqrSfbq/h2mWNBygAILDFVOwb2RHvj2nRUc="; }; - vendorHash = "sha256-AFyvTv1uVeq2KtRG6VToTBnX+8tHorDZPSturJhsrG4="; + vendorHash = "sha256-1LZafkn8FM79aXWMXOiMXPGprC7K75Ol4ERP1B/3vfE="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix index c38e4e247334..c69ec96df6a2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-qd+7tYvRpRMg8Y83L/K8g8fWrfO4rAQj72EpunqfSsc="; + sha256 = "sha256-ZUuMQ0y6qXM9g/snJchqGPf7z+5skE/OPqC3rvRenXo="; }; vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index ae514e2b9226..f2a16ad9b8b9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.24.2"; + version = "0.24.4"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-vKAKDQrQ7FmCnJwo8ItwpiayrHa9bhMognYZMlpZAlM="; + sha256 = "sha256-0KXAN8unaReYFyuGI6XCHhxKiKow0suP9yDl5pI+bGQ="; }; - vendorHash = "sha256-LPxU6qvpUb0ZjzjqGeTywOluwWbsi1YmiYYWJfaMWvg="; + vendorHash = "sha256-gbizFiZ+LFdY0SISK3K0D0vwj4Dq/UMcoCuvUYMB/F4="; subPackages = [ "cmd/kubeseal" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix index ccbde5deac97..5bae083a06f7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "51.0.14"; + version = "51.0.27"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-aFeegAFGRofGa54roJ3EACvk9179YAwsgO97eeoOd6s="; + hash = "sha256-DGyvP2Z3fZNXqKuE42OPdaWfYpIGu9TIBBxbYzRPZ6M="; }; vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index 7a45eea58c42..05704c9831dd 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-Qcy+LGvoDJZ+zpIJvC8P0c5pl6GpiDuq7sWdrdMojmg="; + sha256 = "sha256-APv9Z8cxcG283sEvC3/xwNMXStytM2dr/pemTES0Ltk="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-6JM5r/MUETmlMB/8Z82mpUe8bAym9ekb1HL24ik2OlE="; + vendorHash = "sha256-R2810TRxKDPOBfdCSNFJ4425tHQC6R4d5Xltd7jK2V8="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 3544669ee9cf..79d5649e2b97 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.14.2"; - sha256 = "0j7w1x88fxbwlmdj111l3v02m8a2p75zsjj847d09a901jav3ih5"; + version = "2.14.5"; + sha256 = "1xdqqv62sr0hmjd64lvfvnrxhgdjsvb9xxxp2vvx0iz6rpp00n1x"; vendorHash = "sha256-yEwz9CopCbK8mOUxzjDG3nsbWzhJlA3JTO4nYN8G68E="; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index 8fdbdc3a3e27..5df669ed94a5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.10.4"; - sha256 = "1fbzxkfc957kdhk60x3ywwpn54zq8njqk313cgfygnrmmj3m67j9"; - vendorHash = "sha256-WEnopX/tIRoA5wiiCMue1T3wottxv744Mp7XJl63j4k="; + version = "23.11.4"; + sha256 = "0j6yzjd2rnm6vzn2fky83pw3v943n3chhnr7a302rnafprlbmmp4"; + vendorHash = "sha256-1s2vj9GSNe4j9TtIo69uakrg8PnBHNchlApryBeHmKs="; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix b/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix index bc31e05a6af2..ab960b7526ee 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,15 +14,15 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-alpha5"; + version = "1.6.0-beta1"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-nkDDq9/ruiSvACw997DgnswwTVzCaZ5K9oT2bKrBYWA="; + hash = "sha256-bOZzMraJ1Bc5CauYkJLH4riCOhAbZlXh9TdBjJsp4Ds="; }; - vendorHash = "sha256-mUakrS3d4UXA5XKyuiIUbGsCAiUMwVbYr8UWOyAtA8Y="; + vendorHash = "sha256-T67VFtAsw6Dn+Ma0znwaa53GvzmrNLFoU17rCeJehKw="; ldflags = [ "-s" "-w" ]; postConfigure = '' @@ -58,6 +58,7 @@ let license = licenses.mpl20; maintainers = with maintainers; [ gmemstr + nickcao ]; mainProgram = "tofu"; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 6769c46868d6..2454092e0051 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildGoModule -, buildGo121Module , fetchFromGitHub , fetchFromGitLab , callPackage @@ -87,7 +86,6 @@ 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 ]; }); - tailscale = automated-providers.tailscale.override { mkProviderGoModule = buildGo121Module; }; }; # Put all the providers we not longer support in this list. @@ -98,7 +96,6 @@ let in lib.optionalAttrs config.allowAliases { fly = archived "fly" "2023/10"; - ksyun = removed "ksyun" "2023/04"; }; # excluding aliases, used by terraform-full diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3ba13e12bc57..62ca803c8b63 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -103,11 +103,10 @@ "hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", - "proxyVendor": true, "repo": "terraform-provider-avi", "rev": "v22.1.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-1+VDh9hR/2Knl5oV9ZQiPCt+F7VmaTU4MI1+o8Msu8M=" + "vendorHash": "sha256-r42KHzvRBXuWgLgtg+WUVt0ThjSMXtUKjEE9y/s/1uQ=" }, "aviatrix": { "hash": "sha256-PRYtkq4CLEbUJ7YOSlvDyz+z4icLi0DBkDCTs/tNoIQ=", @@ -1227,11 +1226,10 @@ "hash": "sha256-9SOHw46KChe7bGInsIIyy0pyNG3K7CXNEomHkmpt8d4=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", - "proxyVendor": true, "repo": "terraform-provider-vault", "rev": "v3.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HvjbXSAkbTmADyWQaw0lZV3nZUEIYiAB3VahYvIQeb4=" + "vendorHash": "sha256-5rRWlInDRj7hw4GZqTxfH7Y8tyTvzJgBWA1I5j0EyaI=" }, "vcd": { "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=", diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 70f547fb0225..9937359dd497 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.6.4"; - hash = "sha256-kA0H+JxyMV6RKRr20enTOzfwj2Lk2IP4vivfHv02+w8="; - vendorHash = "sha256-cxnvEwtZLXYZzCITJgYk8hDRndLLC8YTD+RvgcNska0="; + version = "1.6.5"; + hash = "sha256-TJKs7pWoLFIeov/ERgPqZxPtbjSAHrHI2wrSEXUAS1A="; + vendorHash = "sha256-QHfCGlgOv4v3MzUs4JxIHytcyymUYmnk4Z0smgak1Mg="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index f559df2747d8..e0bfdd444efd 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.53.4"; + version = "0.53.8"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UPbiqo0HvBEIAimugNa7WwqwPsLk8C2gS0KqfgFMGQU="; + hash = "sha256-qjtyzwcpkZ1+jfwbpYGEXPLeh5+7iNNRRmn8VvZBIEo="; }; - vendorHash = "sha256-h1rDXxvPhQfGUpxOmnksy3l8kMq93nxOQ9adJFyZnOY="; + vendorHash = "sha256-Eu4BOi9ClzNps20OT4L/AXxKZ5zL9ipSmfDunO6CxNs="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix b/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix index 85645c2849d6..0f98bbdb10db 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix @@ -2,7 +2,7 @@ , stdenvNoCC , version, src , fetchYarnDeps -, fixup_yarn_lock, yarn, nodejs +, prefetch-yarn-deps, yarn, nodejs }: stdenvNoCC.mkDerivation rec { @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { inherit src version; - nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ]; + nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/web/yarn.lock"; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { yarn config --offline set yarn-offline-mirror $yarnOfflineCache cd web - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-engines patchShebangs node_modules export PATH=$PWD/node_modules/.bin:$PATH diff --git a/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix b/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix index 8ea2defea91a..d89b90d92928 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGo121Module rec { pname = "timoni"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-kMqQiFicuKa0j/li9UmitEeSof0vLlgGR4AMtJksROs="; + hash = "sha256-KhDig31BGMmKVrLVFcTXNKjsyAUTb6KEX5PJV2rkMgM="; }; - vendorHash = "sha256-tAqmTl+5tScXOaYWEvMs2RPTdyLTAemQN1VqOQGe6lU="; + vendorHash = "sha256-3RbWHLQLLh/omGttY2wWv2nsuuTE8ALAqgQaiJY/EjI="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix b/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix index 10f8e7a9f577..8256d04d6b97 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.16.4"; + version = "0.17.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-LL+fikMTg79d9goFEkmxwYvF9E0GrPNTLmFy2tfnQtg="; + hash = "sha256-xmSp3cNqNv48gBWpt0Pnvl3l5gIyV1oPNGrB58X+OVU="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index f15e6ac474e2..c8753569d328 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-qa/Ic3qi+CAW9h4W2G8x6UdxPC2SkrMLMJEcxN7eDGY="; + sha256 = "sha256-i0nMr/DXoFLAXZd4YmWhmkuFczFAf2RPq2Cw1lUqJ68="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-TisGl0kM4vMVh9vk6/mRVOaRm9yoTwKkPedTPqdySDY="; + vendorHash = "sha256-kPs7N3N7E1IiBqBIYFwXlNIrGtFnaRJiTFR4eCOc1mo="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/nixpkgs/pkgs/applications/networking/compactor/default.nix b/nixpkgs/pkgs/applications/networking/compactor/default.nix index 6ddc5b0c0098..84c0f6ae8ba5 100644 --- a/nixpkgs/pkgs/applications/networking/compactor/default.nix +++ b/nixpkgs/pkgs/applications/networking/compactor/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4="; }; + patches = [ + ./patches/add-a-space-after-type-in-check-response-opt-sh.patch + ]; + nativeBuildInputs = [ asciidoctor autoreconfHook diff --git a/nixpkgs/pkgs/applications/networking/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch b/nixpkgs/pkgs/applications/networking/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch new file mode 100644 index 000000000000..3c82b3ae3ae8 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch @@ -0,0 +1,24 @@ +From 4535666b23d2ad3fa4066c720fc9b9e51fe4c549 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev <paveloom@riseup.net> +Date: Sat, 18 Nov 2023 16:11:05 +0300 +Subject: [PATCH] Add a space after `Type` in `check-response-opt.sh` + +--- + test-scripts/check-response-opt.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test-scripts/check-response-opt.sh b/test-scripts/check-response-opt.sh +index 2322bc8..f0e7e66 100755 +--- a/test-scripts/check-response-opt.sh ++++ b/test-scripts/check-response-opt.sh +@@ -50,7 +50,7 @@ fi + # Make text file with expected responses. + cat > $tmpdir/opt.gold <<EOF + Name: <Root> +-Type: OPT (41) ++Type: OPT (41) + UDP payload size: 4096 + Higher bits in extended RCODE: 0x00 + EDNS0 version: 0 +-- +2.42.0 diff --git a/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix b/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix index c945576f32e1..53d401f01e18 100644 --- a/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix +++ b/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix @@ -31,5 +31,6 @@ appimageTools.wrapType2 { license = licenses.gpl3Only; maintainers = with maintainers; [ simarra ]; platforms = [ "x86_64-linux" ]; + mainProgram = "cozydrive"; }; } diff --git a/nixpkgs/pkgs/applications/networking/datovka/default.nix b/nixpkgs/pkgs/applications/networking/datovka/default.nix index f86fd87573b3..b72426bc50db 100644 --- a/nixpkgs/pkgs/applications/networking/datovka/default.nix +++ b/nixpkgs/pkgs/applications/networking/datovka/default.nix @@ -29,5 +29,6 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.mmahut ]; platforms = platforms.linux; + mainProgram = "datovka"; }; } diff --git a/nixpkgs/pkgs/applications/networking/davmail/default.nix b/nixpkgs/pkgs/applications/networking/davmail/default.nix index 3f6c52a4d473..188eaecd2dc2 100644 --- a/nixpkgs/pkgs/applications/networking/davmail/default.nix +++ b/nixpkgs/pkgs/applications/networking/davmail/default.nix @@ -8,26 +8,25 @@ , gtk3 , jre , libXtst +, coreutils +, gnugrep , zulu , preferGtk3 ? true , preferZulu ? true }: let - rev = 3423; + rev = 3464; jre' = if preferZulu then zulu else jre; gtk' = if preferGtk3 then gtk3 else gtk2; - - inherit (lib) makeLibraryPath versions; - in stdenv.mkDerivation rec { pname = "davmail"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip"; - sha256 = "sha256-/JsJFtGalNuOz21eeCPR/LvLueMtQAR7VSKN8SpnPvA="; + sha256 = "sha256-FatB0t/BhZRMofYE0KD5LDYGjDQ8hriIszKJP8qNvhw="; }; postPatch = '' @@ -45,7 +44,7 @@ stdenv.mkDerivation rec { cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ --set-default JAVA_OPTS "-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=${lib.versions.major gtk'.version}" \ - --prefix PATH : ${jre'}/bin \ + --prefix PATH : ${lib.makeBinPath [ jre' coreutils gnugrep ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk' libXtst ]} runHook postInstall diff --git a/nixpkgs/pkgs/applications/networking/discordo/default.nix b/nixpkgs/pkgs/applications/networking/discordo/default.nix index 50112238215d..8b46e31b7b5c 100644 --- a/nixpkgs/pkgs/applications/networking/discordo/default.nix +++ b/nixpkgs/pkgs/applications/networking/discordo/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://github.com/ayn2op/discordo"; license = licenses.mit; maintainers = [ maintainers.arian-d ]; + mainProgram = "discordo"; }; } diff --git a/nixpkgs/pkgs/applications/networking/diswall/default.nix b/nixpkgs/pkgs/applications/networking/diswall/default.nix index f7ef51b7040f..3d78aa42a240 100644 --- a/nixpkgs/pkgs/applications/networking/diswall/default.nix +++ b/nixpkgs/pkgs/applications/networking/diswall/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.diswall.stream"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ izorkin ]; + mainProgram = "diswall"; }; } diff --git a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index e9b43a6aa1a8..826be33128a1 100644 --- a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "StackExchange"; - repo = pname; + repo = "dnscontrol"; rev = "v${version}"; - sha256 = "sha256-CyQKQNuCJLtm73ngrGtUmVUfiseXEp2fcKVGvQ1ET5A="; + sha256 = "sha256-FJxr3uq2f8jDG3g06SRO8sTIc6qHqSAOJVYHr4Ug1ag="; }; - vendorHash = "sha256-Q8Xw2vuxiYpkY0/gQlUVWO7WQszv2x1cvbV03Wi1GNg="; + vendorHash = "sha256-O7uuUkS9kX0TdevSg1mrrPMVl4kMZW3rwoIVb/eaNiM="; subPackages = [ "." ]; @@ -27,7 +27,7 @@ buildGoModule rec { homepage = "https://dnscontrol.org/"; changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ mmahut SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; mainProgram = "dnscontrol"; }; } diff --git a/nixpkgs/pkgs/applications/networking/drive/default.nix b/nixpkgs/pkgs/applications/networking/drive/default.nix index 4c7b5727fbac..e8b62033f350 100644 --- a/nixpkgs/pkgs/applications/networking/drive/default.nix +++ b/nixpkgs/pkgs/applications/networking/drive/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { description = "Google Drive client for the commandline"; license = licenses.asl20; maintainers = with maintainers; [ ]; + mainProgram = "drive"; }; } diff --git a/nixpkgs/pkgs/applications/networking/droopy/default.nix b/nixpkgs/pkgs/applications/networking/droopy/default.nix index 47298fb4dbc2..35176db8b241 100644 --- a/nixpkgs/pkgs/applications/networking/droopy/default.nix +++ b/nixpkgs/pkgs/applications/networking/droopy/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { homepage = "http://stackp.online.fr/droopy"; license = licenses.bsd3; maintainers = [ maintainers.Profpatsch ]; + mainProgram = "droopy"; }; } diff --git a/nixpkgs/pkgs/applications/networking/dsvpn/default.nix b/nixpkgs/pkgs/applications/networking/dsvpn/default.nix index f165e6a59942..53aa9fb89408 100644 --- a/nixpkgs/pkgs/applications/networking/dsvpn/default.nix +++ b/nixpkgs/pkgs/applications/networking/dsvpn/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.marsam ]; platforms = platforms.unix; + mainProgram = "dsvpn"; }; } diff --git a/nixpkgs/pkgs/applications/networking/errbot/default.nix b/nixpkgs/pkgs/applications/networking/errbot/default.nix index 9e239627b02c..c94bbc878018 100644 --- a/nixpkgs/pkgs/applications/networking/errbot/default.nix +++ b/nixpkgs/pkgs/applications/networking/errbot/default.nix @@ -68,5 +68,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" + mainProgram = "errbot"; }; } diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 1e058229933d..3afc84905fb5 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/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", ] @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -67,6 +67,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.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -77,30 +83,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -111,24 +116,24 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[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" @@ -138,10 +143,10 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "article_scraper" -version = "2.0.0-alpha.0" -source = "git+https://gitlab.com/news-flash/article_scraper.git#d8ceee140330137501ad187eab057b31ee289c40" +version = "2.0.0" +source = "git+https://gitlab.com/news-flash/article_scraper.git#f9812b556c9cf05de13d936ea73f03c95de79bbc" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", "chrono", "encoding_rs", "escaper", @@ -152,7 +157,7 @@ dependencies = [ "once_cell", "regex", "reqwest", - "rust-embed", + "rust-embed 6.8.1", "thiserror", "tokio", "url", @@ -160,9 +165,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.4.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +checksum = "f3affe251686bd936a0afb74b9693e8bf2f193d51da1b9a45d3f1303a9bd2cc7" dependencies = [ "async-std", "enumflags2", @@ -182,26 +187,26 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" dependencies = [ "brotli", "flate2", @@ -213,14 +218,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "78f2db9467baa66a700abce2a18c5ad793f6f83310aca1284796fc3921d113fd" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 2.0.1", "futures-lite", "slab", ] @@ -266,30 +271,66 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-process" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.14", + "windows-sys", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", +] + +[[package]] +name = "async-signal" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4af361a844928cb7d36590d406709473a1b574f443094422ef166daa3b493208" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "concurrent-queue", + "futures-core", + "futures-io", + "libc", + "signal-hook-registry", + "slab", + "windows-sys", ] [[package]] @@ -320,37 +361,26 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -360,15 +390,15 @@ 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", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -381,16 +411,18 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bigdecimal" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744" +checksum = "454bca3db10617b88b566f205ed190aedb0e0e6dd4cad61d3988a72e8c5594cb" dependencies = [ + "autocfg", + "libm", "num-bigint", "num-integer", "num-traits", @@ -410,9 +442,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.2.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block" @@ -457,17 +489,18 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1" dependencies = [ "async-channel", "async-lock", "async-task", - "atomic-waker", - "fastrand", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "log", + "piper", + "tracing", ] [[package]] @@ -493,15 +526,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytecount" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -511,17 +550,23 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[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" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +checksum = "1c0466dfa8c0ee78deef390c274ad756801e0a6dbb86c5ef0924a298c5761c4d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -531,9 +576,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -541,16 +586,50 @@ dependencies = [ ] [[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", +] + +[[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 = [ + "libc", +] [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -564,17 +643,16 @@ 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", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -588,49 +666,50 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.5" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", + "clap_derive", ] [[package]] name = "clap_builder" -version = "4.2.5" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", "strsim", ] [[package]] -name = "clap_lex" -version = "0.4.1" +name = "clap_derive" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.37", +] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "clap_lex" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "color-backtrace" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6c04463c99389fff045d2b90ce84f5131332712c7ffbede020f5e9ad1ed685" +checksum = "b6fcd4d200ae702628e8d54bafff5f7e7397b031a5849656a6f5bfe2c5fb780d" dependencies = [ - "atty", "backtrace", "termcolor", ] @@ -648,10 +727,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] +name = "commafeed_api" +version = "0.1.0" +source = "git+https://gitlab.com/news-flash/commafeed_api.git#701976f8fccf887416a1306b6d0e0a3bb026573f" +dependencies = [ + "base64 0.21.4", + "chrono", + "log", + "reqwest", + "serde", + "serde_json", + "thiserror", + "url", +] + +[[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -663,23 +757,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.20", + "time", "version_check", ] [[package]] name = "cookie_store" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4b6aa369f41f5faa04bb80c9b1f4216ea81646ed6124d76ba5c49a7aafd9cd" +checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" dependencies = [ "cookie", "idna 0.2.3", "log", "publicsuffix", "serde", + "serde_derive", "serde_json", - "time 0.3.20", + "time", "url", ] @@ -701,9 +796,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -749,22 +844,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -786,64 +881,10 @@ dependencies = [ ] [[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 = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "debug-helper" @@ -852,6 +893,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -881,9 +928,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72eb77396836a4505da85bae0712fa324b74acfe1876d7c2f7e694ef3d0ee373" +checksum = "53c8a2cb22327206568569e5a45bb5a2c946455efdd76e24d15b7e82171af95e" dependencies = [ "bigdecimal", "chrono", @@ -896,27 +943,27 @@ dependencies = [ "num-traits", "r2d2", "serde_json", - "time 0.3.20", + "time", "uuid", ] [[package]] name = "diesel_derives" -version = "2.0.2" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4" +checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" dependencies = [ - "proc-macro-error", + "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "diesel_migrations" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ae22beef5e9d6fab9225ddb073c1c6c1a7a6ded5019d5da11d1e5c5adc34e2" +checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" dependencies = [ "diesel", "migrations_internals", @@ -924,13 +971,22 @@ dependencies = [ ] [[package]] +name = "diesel_table_macro_syntax" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.37", +] + +[[package]] name = "diffus" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c0ff24a73b51d9009c40897faf87d31b77345c90ffbf4dc3a1d2957032c5653" dependencies = [ "diffus-derive", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -955,9 +1011,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -974,11 +1030,11 @@ dependencies = [ [[package]] name = "dirs" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.0", + "dirs-sys 0.4.1", ] [[package]] @@ -994,26 +1050,27 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "windows-sys 0.45.0", + "windows-sys", ] [[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 = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1038,9 +1095,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -1048,24 +1105,30 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[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.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1079,6 +1142,15 @@ dependencies = [ ] [[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] name = "escaper" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1094,16 +1166,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "exr" -version = "1.6.3" +version = "1.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.6.2", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -1129,6 +1212,12 @@ dependencies = [ ] [[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" @@ -1172,9 +1261,9 @@ dependencies = [ [[package]] name = "feedly_api" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fa0d0ad6e1cd3faf4e83ffba99584c501a909141fb0bc9ffbd6124778587608" +checksum = "36971ec64540957e96aaa419c5e6026dd9704f8e587d7e42c25ec35580ac9eb2" dependencies = [ "chrono", "log", @@ -1184,6 +1273,7 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", + "tokio", "url", ] @@ -1204,34 +1294,30 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", + "memoffset 0.9.0", "rustc_version", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin 0.9.8", ] @@ -1258,9 +1344,9 @@ 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", ] @@ -1330,7 +1416,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1347,7 +1433,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[package]] @@ -1382,11 +1468,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1396,9 +1481,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1409,11 +1494,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1425,9 +1509,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1463,15 +1547,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1506,17 +1588,16 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.17.9" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" +checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1532,9 +1613,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1545,11 +1626,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.9" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" +checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -1568,30 +1649,35 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.9" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" +checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "glib-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", ] [[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] name = "gloo-timers" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1605,9 +1691,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1616,9 +1702,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1627,9 +1713,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1639,9 +1725,9 @@ dependencies = [ [[package]] name = "greader_api" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f83b96865d8645f89a0353148d8c8a466e877f5f62ceef5342b6b8891d5ca23" +checksum = "787d011b04b4e309822ce9d02e4a61cd9f8a5b37ea019bb853f37bf1a3f06dde" dependencies = [ "chrono", "log", @@ -1655,11 +1741,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -1671,9 +1756,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1687,11 +1772,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1704,15 +1788,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1724,9 +1807,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1743,9 +1826,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1753,7 +1836,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1771,9 +1854,9 @@ dependencies = [ [[package]] name = "hard-xml" -version = "1.21.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e352818f3837f84861450edf5d274ff601663a38a4488e96c42f08cc112f797" +checksum = "b74134bb74033894bf6b22cb9078c5e19bb750bd586f5cea24bc4acf23e9da9a" dependencies = [ "hard-xml-derive", "jetscii", @@ -1784,9 +1867,9 @@ dependencies = [ [[package]] name = "hard-xml-derive" -version = "1.21.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e644596eb580f65e712e6e0957f1eaa642197ea865011ca540376ae6a21881" +checksum = "f50ce8d120d040bf18a4d8dd75ea96497cc75d285b09e2473e88df57bb20f3ab" dependencies = [ "bitflags 1.3.2", "proc-macro2", @@ -1801,34 +1884,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" +name = "hashbrown" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1907,9 +1978,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1919,9 +1990,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", @@ -1934,7 +2005,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1943,10 +2014,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -1969,9 +2041,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1983,12 +2055,11 @@ dependencies = [ [[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]] @@ -2013,10 +2084,20 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2044,7 +2125,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -2058,32 +2149,32 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "ipconfig" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.4", "widestring", - "winapi", + "windows-sys", "winreg", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "ipnetwork" @@ -2095,48 +2186,45 @@ dependencies = [ ] [[package]] -name = "is-terminal" -version = "0.4.7" +name = "itertools" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", + "either", ] [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "javascriptcore6" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab2e7a6ba3112cf23e7bf63f0aefe5058e6b4f1f759d47bf22922f73ed17e79" dependencies = [ - "bitflags 1.3.2", "glib", "javascriptcore6-sys", "libc", - "once_cell", ] [[package]] name = "javascriptcore6-sys" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5a26b89c59d679b0d57dd98235e3125b132407cc14c3fb6382df4b84475c39f" dependencies = [ "glib-sys", "gobject-sys", @@ -2161,9 +2249,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2191,12 +2279,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82776542b73ac5691b2bddf3e2aaf0157d34f35193fb522de2fc258006c1785" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ - "bitflags 1.3.2", - "futures-channel", "gdk-pixbuf", "gdk4", "gio", @@ -2204,15 +2290,14 @@ dependencies = [ "gtk4", "libadwaita-sys", "libc", - "once_cell", "pango", ] [[package]] name = "libadwaita-sys" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91be74a61f26efa6946c02dad76eb4cd3021addb0ff85dde445c1cd41d2eca2d" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ "gdk4-sys", "gio-sys", @@ -2226,9 +2311,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.148" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" + +[[package]] +name = "libm" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsqlite3-sys" @@ -2242,9 +2333,9 @@ dependencies = [ [[package]] name = "libxml" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca310e4db05e9b7386ad0734975fabc912b66f6bc50a98f525e690822da1ee0e" +checksum = "5fe73cdec2bcb36d25a9fe3f607ffcd44bb8907ca0100c4098d1aa342d1e7bec" dependencies = [ "libc", "pkg-config", @@ -2252,15 +2343,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2277,9 +2359,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "locale_config" @@ -2296,9 +2384,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2306,11 +2394,10 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ - "cfg-if", "serde", "value-bag", ] @@ -2363,6 +2450,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] name = "magic-crypt" version = "3.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2451,9 +2547,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[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 = "memoffset" @@ -2466,28 +2562,28 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "migrations_internals" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c493c09323068c01e54c685f7da41a9ccf9219735c3766fbfd6099806ea08fbc" +checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" dependencies = [ "serde", - "toml 0.5.11", + "toml", ] [[package]] name = "migrations_macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8ff27a350511de30cdabb77147501c36ef02e0451d957abea2f30caffb2b58" +checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" dependencies = [ "migrations_internals", "proc-macro2", @@ -2528,15 +2624,6 @@ dependencies = [ [[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" @@ -2547,26 +2634,47 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] -name = "nanorand" -version = "0.7.0" +name = "moka" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +checksum = "fa6e72583bf6830c956235bff0d5afec8cf2952f579ebad18ae7821a917d950f" dependencies = [ - "getrandom 0.2.9", + "async-io", + "async-lock", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "futures-util", + "once_cell", + "parking_lot", + "quanta", + "rustc_version", + "scheduled-thread-pool", + "skeptic", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", ] [[package]] +name = "nanohtml2text" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "999681fe3c0524336e98ece1c25ee4278607f25cc1e361ad0f9201c8bf56dc2c" + +[[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2593,14 +2701,15 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "news-flash" version = "2.3.0-alpha.0" -source = "git+https://gitlab.com/news-flash/news_flash.git#60eff75c158aa04f67289900c7e7fe958f29f130" +source = "git+https://gitlab.com/news_flash/news_flash.git#b1763aa942149891afa760255724b0a03319e1e4" dependencies = [ "article_scraper", "async-trait", - "base64 0.21.0", - "bitflags 2.2.1", + "base64 0.21.4", + "bitflags 2.4.0", "bytes", "chrono", + "commafeed_api", "diesel", "diesel_migrations", "escaper", @@ -2612,23 +2721,25 @@ dependencies = [ "greader_api", "hex", "image", + "itertools 0.11.0", "libxml", "log", "magic-crypt", "mime", "mime_guess", "miniflux_api", + "moka", + "nanohtml2text", "newsblur_api", "nextcloud_news_api", "obfstr", "once_cell", "opml", - "parking_lot", "random_color", - "rayon", "regex", "reqwest", - "rust-embed", + "rust-embed 8.0.0", + "sanitize-filename", "semver", "serde", "serde_json", @@ -2642,15 +2753,18 @@ name = "news_flash_gtk" version = "0.0.0" dependencies = [ "ashpd", + "base64 0.21.4", + "bytesize", "chrono", "clap", "color-backtrace", "diffus", - "dirs 5.0.0", + "dirs 5.0.1", "eyre", "feedly_api", "futures", "futures-util", + "gdk-pixbuf", "gdk4", "gettext-rs", "gio", @@ -2663,15 +2777,13 @@ dependencies = [ "log", "log4rs", "news-flash", - "num_cpus", "once_cell", "pango", - "parking_lot", "percent-encoding", "rc-writer", "regex", "reqwest", - "rust-embed", + "rust-embed 8.0.0", "serde", "serde_json", "thiserror", @@ -2684,7 +2796,7 @@ dependencies = [ [[package]] name = "newsblur_api" version = "0.2.0" -source = "git+https://gitlab.com/news-flash/newsblur_api.git#de359af9cfaea40cb603efd6f939a162f2973500" +source = "git+https://gitlab.com/news-flash/newsblur_api.git#5e7d06f357159d3623964b6b56c7672457c14340" dependencies = [ "reqwest", "serde", @@ -2699,7 +2811,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488e5fb51484deb6bc5bc22f0b0db4902ae7e391d075f8d1a1b9a9674ea326d3" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", "log", "reqwest", "serde", @@ -2712,22 +2824,21 @@ 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 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "static_assertions", ] [[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", @@ -2757,20 +2868,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" 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", ] @@ -2811,18 +2922,18 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -2832,11 +2943,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -2853,7 +2964,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[package]] @@ -2864,9 +2975,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -2886,6 +2997,12 @@ dependencies = [ ] [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "ordered-float" version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2906,11 +3023,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc", @@ -2920,9 +3036,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -2932,9 +3048,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -2948,22 +3064,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[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 = "phf" @@ -3004,30 +3120,10 @@ dependencies = [ ] [[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", - "quote", - "syn 1.0.109", -] - -[[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" @@ -3036,22 +3132,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -3067,7 +3174,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3118,9 +3225,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -3142,6 +3249,17 @@ dependencies = [ ] [[package]] +name = "pulldown-cmark" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +dependencies = [ + "bitflags 1.3.2", + "memchr", + "unicase", +] + +[[package]] name = "qoi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3151,6 +3269,22 @@ dependencies = [ ] [[package]] +name = "quanta" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] name = "quick-error" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3168,9 +3302,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3246,7 +3380,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -3277,10 +3411,19 @@ dependencies = [ ] [[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3288,14 +3431,12 @@ 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]] @@ -3328,16 +3469,28 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.8.1" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -3346,18 +3499,18 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "async-compression", - "base64 0.21.0", + "base64 0.21.4", "bytes", "cookie", "cookie_store", @@ -3427,36 +3580,70 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.6.1" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +dependencies = [ + "rust-embed-impl 6.8.1", + "rust-embed-utils 7.8.1", + "walkdir", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl 8.0.0", + "rust-embed-utils 8.0.0", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b68543d5527e158213414a92832d2aab11a84d2571a5eb021ebe22c43aab066" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" dependencies = [ - "rust-embed-impl", - "rust-embed-utils", + "proc-macro2", + "quote", + "rust-embed-utils 7.8.1", + "syn 2.0.37", "walkdir", ] [[package]] name = "rust-embed-impl" -version = "6.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" dependencies = [ "proc-macro2", "quote", - "rust-embed-utils", + "rust-embed-utils 8.0.0", "shellexpand", - "syn 1.0.109", + "syn 2.0.37", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +dependencies = [ + "sha2 0.10.8", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" dependencies = [ - "sha2 0.10.6", + "sha2 0.10.8", "walkdir", ] @@ -3477,44 +3664,67 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.18" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.7", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -3526,12 +3736,22 @@ dependencies = [ ] [[package]] +name = "sanitize-filename" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -3545,15 +3765,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3567,9 +3781,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3580,9 +3794,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3590,15 +3804,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.160" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -3615,20 +3832,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[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", @@ -3637,20 +3854,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -3673,7 +3890,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", @@ -3681,13 +3898,13 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3705,13 +3922,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3724,31 +3941,55 @@ dependencies = [ ] [[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] [[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.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -3761,25 +4002,33 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "soup3" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efe3b0d8335955d6433720767503233dc50ef4fb7fb72cd66634dbf764bb019" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" dependencies = [ - "bitflags 1.3.2", "futures-channel", "gio", "glib", "libc", - "once_cell", "soup3-sys", ] [[package]] name = "soup3-sys" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468c7c093ce5665bd19d19a871faf7b92f257788d1311ac874ab157b18867648" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" dependencies = [ "gio-sys", "glib-sys", @@ -3854,9 +4103,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -3865,22 +4114,28 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.7.3", + "toml", "version-compare", ] [[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + +[[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-dir" @@ -3890,15 +4145,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[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", - "fastrand", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.14", + "windows-sys", ] [[package]] @@ -3914,38 +4169,38 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[package]] name = "thread-id" -version = "4.0.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" +checksum = "79474f573561cdc4871a0de34a51c92f7f5a56039113fbb5b9c9f96bdb756669" dependencies = [ "libc", "redox_syscall 0.2.16", @@ -3954,9 +4209,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -3976,21 +4231,11 @@ dependencies = [ [[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.20" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -3999,15 +4244,15 @@ 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.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -4029,19 +4274,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.4", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4052,7 +4297,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[package]] @@ -4067,13 +4312,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -4090,9 +4334,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -4104,18 +4348,9 @@ dependencies = [ [[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.3" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -4125,20 +4360,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.0.1", "serde", "serde_spanned", "toml_datetime", @@ -4165,25 +4400,31 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.37", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] [[package]] +name = "triomphe" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" + +[[package]] name = "trust-dns-proto" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4245,9 +4486,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" @@ -4261,9 +4502,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -4276,9 +4517,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[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" @@ -4290,12 +4531,6 @@ dependencies = [ ] [[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] name = "unsafe-any-ors" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4312,12 +4547,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[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", + "idna 0.4.0", "percent-encoding", "serde", ] @@ -4336,22 +4571,18 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" [[package]] name = "vcpkg" @@ -4373,15 +4604,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -4389,11 +4620,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -4405,21 +4635,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4427,24 +4651,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -4454,9 +4678,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4464,28 +4688,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -4496,9 +4720,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -4506,10 +4730,10 @@ dependencies = [ [[package]] name = "webkit6" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111922d85b0f570bc1468d190037299fd0eca36f24147f74c1ad20fae5e21370" dependencies = [ - "bitflags 1.3.2", "gdk4", "gio", "glib", @@ -4523,8 +4747,9 @@ dependencies = [ [[package]] name = "webkit6-sys" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfc4fbaf44fd645711e36a97437443e7f06b401fb66ccc3e5ae17eeb6f5cb681" dependencies = [ "gdk4-sys", "gio-sys", @@ -4538,23 +4763,10 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -4564,9 +4776,9 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -4586,9 +4798,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4605,31 +4817,7 @@ 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-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", + "windows-targets", ] [[package]] @@ -4638,139 +4826,83 @@ 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", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[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" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[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 = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.4" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5617da7e1f97bf363947d767b91aaf3c2bbc19db7fda9c65af1278713d58e0a2" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[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", + "cfg-if", + "windows-sys", ] [[package]] @@ -4785,9 +4917,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xml5ever" @@ -4826,22 +4958,24 @@ dependencies = [ [[package]] name = "zbus" -version = "3.12.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" +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", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", @@ -4865,9 +4999,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.12.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4879,9 +5013,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" dependencies = [ "serde", "static_assertions", @@ -4890,18 +5024,18 @@ dependencies = [ [[package]] name = "zune-inflate" -version = "0.2.53" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] [[package]] name = "zvariant" -version = "3.12.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" dependencies = [ "byteorder", "enumflags2", @@ -4914,9 +5048,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4927,9 +5061,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index 481113682bce..5631a8419cc2 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -7,6 +7,7 @@ , ninja , pkg-config , rustc +, blueprint-compiler , wrapGAppsHook4 , gdk-pixbuf , glib @@ -24,22 +25,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.3.1"; + version = "3.0.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-JUAlDc2mp8M0vjiWcDoyBw/sKCmd4J8e9wEwZoiW0AE="; + sha256 = "sha256-tJKr2bGkdpEb+25eN0ZfHhEDl5Zdf8fdaC/rNMbH8Ws="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic="; - "news-flash-2.3.0-alpha.0" = "sha256-phoZmTY1YVZIIktqLMnal9H5SMgNWwx7m+7AMtDcFJM="; - "newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI="; - "article_scraper-2.0.0-alpha.0" = "sha256-HPEKZc7O7pbgcwR2l0kD/5442W1hzrfMadc0amrjxwI="; + "news-flash-2.3.0-alpha.0" = "sha256-H0osT7IrPbQ3RQYJZE7J+n7u4UCT86LAybUF3vvIXkA="; + "newsblur_api-0.2.0" = "sha256-eysCB19znQF8mRwQ64nSp6KuvJ1Trot4g4WCdQDedo8="; + "article_scraper-2.0.0" = "sha256-FnOmrZyYewOuU8Au7fhmSJHN7UPCx/CxBV8UtSHattU="; + "commafeed_api-0.1.0" = "sha256-69UAmyUm0WG3qPoWZw4PekXh1RjIP5l3dx3gjWfxJDQ="; }; }; @@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc + blueprint-compiler ]; buildInputs = [ @@ -103,6 +105,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau stunkymonkey ]; platforms = platforms.unix; - mainProgram = "com.gitlab.newsflash"; + mainProgram = "io.gitlab.news_flash.NewsFlash"; }; }) diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch index b638f30cd44c..ab4972b11a13 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch @@ -2,9 +2,13 @@ diff --git a/meson.build b/meson.build index 1d7089c..1952e7f 100644 --- a/meson.build +++ b/meson.build -@@ -61,5 +61,3 @@ meson.add_dist_script( - meson.source_root(), - join_paths(meson.build_root(), 'meson-dist', meson.project_name() + '-' + newsflash_version) +@@ -58,8 +58,8 @@ meson.add_dist_script( + subdir('src') + + gnome.post_install( +- gtk_update_icon_cache: true, ++ gtk_update_icon_cache: false, + glib_compile_schemas: false, +- update_desktop_database: true, ++ update_desktop_database: false, ) -- --meson.add_install_script('build-aux/meson_post_install.py') diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index da654a6bdd39..5c031ebc479c 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.5.1"; + version = "4.5.3"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-tgXBsby9ML+m4b2hvLXHIb552o5x6l3kO8YTeZRCExI="; + sha256 = "sha256-eF0jPT0gQnnBWu9IKfY0DwMwotL3IEjovqnQqx9v2NA="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/nixpkgs/pkgs/applications/networking/filebrowser/default.nix b/nixpkgs/pkgs/applications/networking/filebrowser/default.nix index 153cc791cbf9..334302cae008 100644 --- a/nixpkgs/pkgs/applications/networking/filebrowser/default.nix +++ b/nixpkgs/pkgs/applications/networking/filebrowser/default.nix @@ -56,5 +56,6 @@ buildGoModule rec { homepage = "https://filebrowser.org"; license = licenses.asl20; maintainers = with maintainers; [ nielsegberts ]; + mainProgram = "filebrowser"; }; } diff --git a/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/nixpkgs/pkgs/applications/networking/firewalld/default.nix index 6b96332a6f90..0af5c0c9caac 100644 --- a/nixpkgs/pkgs/applications/networking/firewalld/default.nix +++ b/nixpkgs/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-hGMO3uqUlh5h4HYmJiFdfZZw+y1yjprlSadYvix2LIU="; + sha256 = "sha256-nCCIi+UAQqvx+IqQDr6tQj42OHYamvCnKeBJOm6XjZE="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/flexget/default.nix b/nixpkgs/pkgs/applications/networking/flexget/default.nix index 792d5c93a9e5..ae0ba30d559b 100644 --- a/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.18"; + version = "3.10.1"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-Wxi6+6c/PK990YCoFKBMxJbYgMkS9y46hNIlkVhjbA4="; + hash = "sha256-4r+PADMUpyvWNvA7MSgjx1VcCJKrYJLyvEn9esZKCRw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/freefilesync/default.nix b/nixpkgs/pkgs/applications/networking/freefilesync/default.nix index 0727848f8a8a..b705b55723a5 100644 --- a/nixpkgs/pkgs/applications/networking/freefilesync/default.nix +++ b/nixpkgs/pkgs/applications/networking/freefilesync/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.1"; + version = "13.2"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-xuJQOegmZHPsCmJU2akTD4nQh05M+rpnjQVEer33SCk="; + hash = "sha256-Hb3DkHdINtg5vNs6IcCHKxgSiN5u/2kY8V8Fnq5yFCM="; }; sourceRoot = "."; @@ -45,10 +45,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch"; postFetch = '' substituteInPlace $out \ - --replace "-std=c++2b" "-std=c++23" + --replace "-std=c++2b" "-std=c++23" \ + --replace "imageWidth," "wxsizeToScreen(imageWidth)," ''; excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ]; - hash = "sha256-CtUC94AoYTxoqSMWZrzuO3jTD46rj11JnbNyXtWckCo="; + hash = "sha256-LH549fJWGpJ0p6/0YNda1zZHGs/QRl1CYLC/vYKdkO4="; }) # Fix build with GTK 3 (fetchpatch { diff --git a/nixpkgs/pkgs/applications/networking/gdrive/default.nix b/nixpkgs/pkgs/applications/networking/gdrive/default.nix index c442303e6758..2d100e3c2159 100644 --- a/nixpkgs/pkgs/applications/networking/gdrive/default.nix +++ b/nixpkgs/pkgs/applications/networking/gdrive/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { description = "A command line utility for interacting with Google Drive"; license = licenses.mit; maintainers = [ maintainers.rzetterberg ]; + mainProgram = "gdrive"; }; } diff --git a/nixpkgs/pkgs/applications/networking/gdrive3/default.nix b/nixpkgs/pkgs/applications/networking/gdrive3/default.nix index 8d9553270906..4e7fea129654 100644 --- a/nixpkgs/pkgs/applications/networking/gdrive3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gdrive3/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/glotlabs/gdrive/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "gdrive"; }; } diff --git a/nixpkgs/pkgs/applications/networking/geph/default.nix b/nixpkgs/pkgs/applications/networking/geph/default.nix index 4ebbc3370e4d..1b839d748477 100644 --- a/nixpkgs/pkgs/applications/networking/geph/default.nix +++ b/nixpkgs/pkgs/applications/networking/geph/default.nix @@ -5,6 +5,7 @@ , buildGoModule , makeWrapper , nodePackages +, cacert , esbuild , jq , moreutils @@ -69,6 +70,7 @@ in jq moreutils nodePackages.pnpm + cacert ]; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/giara/default.nix b/nixpkgs/pkgs/applications/networking/giara/default.nix index 7335a6092024..9acbf6f929b9 100644 --- a/nixpkgs/pkgs/applications/networking/giara/default.nix +++ b/nixpkgs/pkgs/applications/networking/giara/default.nix @@ -73,5 +73,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://gitlab.gnome.org/World/giara"; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "giara"; }; } diff --git a/nixpkgs/pkgs/applications/networking/gnmic/default.nix b/nixpkgs/pkgs/applications/networking/gnmic/default.nix index c6d8770415a1..3bd4697a6e6e 100644 --- a/nixpkgs/pkgs/applications/networking/gnmic/default.nix +++ b/nixpkgs/pkgs/applications/networking/gnmic/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { changelog = "https://github.com/openconfig/gnmic/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ vincentbernat ]; + mainProgram = "gnmic"; }; } diff --git a/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix b/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix index b9722b6989ff..e7bfde8a5192 100644 --- a/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "gnome-network-displays"; }; }) diff --git a/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/nixpkgs/pkgs/applications/networking/gns3/gui.nix index 85f0d7c0e638..67a60559d99d 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/gui.nix @@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { setuptools sip_4 (pyqt5.override { withWebSockets = true; }) truststore + qt5.qtwayland ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; diff --git a/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 2367f847d107..281c9e5526eb 100644 --- a/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -27,5 +27,6 @@ buildDunePackage rec { license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ obadz ]; + mainProgram = "google-drive-ocamlfuse"; }; } diff --git a/nixpkgs/pkgs/applications/networking/gossa/default.nix b/nixpkgs/pkgs/applications/networking/gossa/default.nix index 17d9f828b642..13b59f4c4d9d 100644 --- a/nixpkgs/pkgs/applications/networking/gossa/default.nix +++ b/nixpkgs/pkgs/applications/networking/gossa/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { description = "A fast and simple multimedia fileserver"; license = licenses.mit; maintainers = with maintainers; [ dsymbol ]; + mainProgram = "gossa"; }; } diff --git a/nixpkgs/pkgs/applications/networking/headlines/default.nix b/nixpkgs/pkgs/applications/networking/headlines/default.nix index ed26c6f60de2..8db698e963bc 100644 --- a/nixpkgs/pkgs/applications/networking/headlines/default.nix +++ b/nixpkgs/pkgs/applications/networking/headlines/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ chuangzhu ]; + mainProgram = "headlines"; }; } diff --git a/nixpkgs/pkgs/applications/networking/hpmyroom/default.nix b/nixpkgs/pkgs/applications/networking/hpmyroom/default.nix index 1897a283f70d..a177256432d3 100644 --- a/nixpkgs/pkgs/applications/networking/hpmyroom/default.nix +++ b/nixpkgs/pkgs/applications/networking/hpmyroom/default.nix @@ -55,5 +55,6 @@ mkDerivation rec { homepage = "https://myroom.hpe.com"; # TODO: A Darwin binary is available upstream platforms = [ "x86_64-linux" ]; + mainProgram = "hpmyroom"; }; } diff --git a/nixpkgs/pkgs/applications/networking/hydroxide/default.nix b/nixpkgs/pkgs/applications/networking/hydroxide/default.nix index 994e17c750c8..132ad32160b9 100644 --- a/nixpkgs/pkgs/applications/networking/hydroxide/default.nix +++ b/nixpkgs/pkgs/applications/networking/hydroxide/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/emersion/hydroxide"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "hydroxide"; }; } diff --git a/nixpkgs/pkgs/applications/networking/icemon/default.nix b/nixpkgs/pkgs/applications/networking/icemon/default.nix index b757445eb087..7fa4c37b557a 100644 --- a/nixpkgs/pkgs/applications/networking/icemon/default.nix +++ b/nixpkgs/pkgs/applications/networking/icemon/default.nix @@ -20,5 +20,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux ++ darwin; + mainProgram = "icemon"; }; } diff --git a/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix b/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix index c8db9d33a2ce..eb784c95b9fc 100644 --- a/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix +++ b/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-YEfHX555qbDMbWx2MgJKQSaBK8IS9SrPXTyBPMfJ+ws="; + hash = "sha256-tOtgSDjvmag5a8i3u1TK0R8kQsvXy7MA5/WqsZCXvE0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 3d49f47f8163..7e47b6fe698b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "abaddon"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-Rz3c6RMZUiKQ0YKKQkCEkelfIGUq+xVmgNskj7uEjGI="; + hash = "sha256-2iozeRuY/+JDnaHfAYiXNS1VgSrHAxXPuI8BevEEKTc="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix index 8d524bfba47e..09ba8c4d1354 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -12,6 +12,7 @@ , evolution-data-server , feedbackd , glibmm +, libsecret , gnome-desktop , gspell , gtk3 @@ -59,6 +60,7 @@ stdenv.mkDerivation rec { evolution-data-server feedbackd glibmm + libsecret gnome-desktop gspell gtk3 diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index fea9da80d19e..a946ab60e4db 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -5,6 +5,7 @@ , buildGoModule , esbuild , fetchFromGitHub +, jq , libdeltachat , makeDesktopItem , makeWrapper @@ -35,18 +36,26 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.41.1"; + version = "1.42.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-ITcBIm47OiGy/i6jnG6r1OoStjRPystOts6ViLioLNY="; + hash = "sha256-Ua4HN02203l2FgeMotqLjcRSEHFP/4OTrl8sPS/0C+k="; }; - npmDepsHash = "sha256-+t6m2kDUOh6kIkbZgol/CQciDTxUZSkTr1amPywrMb4="; + npmDepsHash = "sha256-c9ZwShmHIoFJ2mAabKyYkYsCMXqxUf+tAS1a1/7s0qo="; + + postPatch = '' + test \ + $(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \ + = $(pkg-config --modversion deltachat) \ + || (echo "error: libdeltachat version does not match jsonrpc-client" && exit 1) + ''; nativeBuildInputs = [ + jq makeWrapper pkg-config python3 diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix new file mode 100644 index 000000000000..44ef7cae84c7 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, pkg-config +, qtbase +, qtwebengine +, qtwayland +, pipewire +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "discord-screenaudio"; + version = "1.9.2"; + + src = fetchFromGitHub { + owner = "maltejur"; + repo = "discord-screenaudio"; + rev = "v${version}"; + hash = "sha256-it7JSmiDz3k1j+qEZrrNhyAuoixiQuiEbXac7lbJmko="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + cmake + pkg-config + ]; + + buildInputs = [ + qtbase + qtwebengine + qtwayland + pipewire + ]; + + preConfigure = '' + # version.cmake either uses git tags or a version.txt file to get app version. + # Since cmake can't access git tags, write the version to a version.txt ourselves. + echo "${version}" > version.txt + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A custom discord client that supports streaming with audio on Linux"; + homepage = "https://github.com/maltejur/discord-screenaudio"; + downloadPage = "https://github.com/maltejur/discord-screenaudio/releases"; + changelog = "https://github.com/maltejur/discord-screenaudio/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ huantian ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index ce304a4fb23a..dbb05162f12a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Open-source alternative of Discord desktop's \"app.asar\"."; homepage = "https://openasar.dev"; license = licenses.mit; - maintainers = with maintainers; [ pedrohlc ]; + maintainers = with maintainers; [ ]; platforms = nodejs.meta.platforms; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 7611f4dfa03f..4eb5707fe256 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeWrapper , makeDesktopItem -, fixup_yarn_lock +, prefetch-yarn-deps , yarn , nodejs , fetchYarnDeps @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = desktopYarnHash; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper jq ] + nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper jq ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; inherit seshat; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 4e80744a4c0f..343c21d64730 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -6,7 +6,7 @@ , writeText , jq , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs , jitsi-meet }: @@ -33,7 +33,18 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = webYarnHash; }; - nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; + nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; + + buildPhase = '' + runHook preBuild + + export VERSION=${finalAttrs.version} + yarn --offline build:res + yarn --offline build:module_system + yarn --offline build:bundle + + runHook postBuild + ''; configurePhase = '' runHook preConfigure @@ -46,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { export NODE_OPTIONS=--openssl-legacy-provider mkdir -p $HOME - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $offlineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules @@ -54,17 +65,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { runHook postConfigure ''; - buildPhase = '' - runHook preBuild - - export VERSION=${finalAttrs.version} - yarn build:res --offline - yarn build:module_system --offline - yarn build:bundle --offline - - runHook postBuild - ''; - installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index a49a2f271583..a730d8611b78 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.47"; + "version" = "1.11.50"; "hashes" = { - "desktopSrcHash" = "sha256-Ea3LJt+3HAOX2PTREMojtuPVTeA6u7VJtysd8bbTbwU="; - "desktopYarnHash" = "1nssv92yk1a53v7mvijkrb3gzif5xrz2j6lxvg7p340z42rm7f9v"; - "webSrcHash" = "sha256-DPBMZMjDnwjdNsePcUBBU0KRGOpOmNHgQZn9/ad/Qss="; - "webYarnHash" = "0rzipmaq0jarzdawl7lmxnapwzl52kklxadm859hgx9b1hd5vwj7"; + "desktopSrcHash" = "sha256-ZSzH0QWUSmoSk57TF7EH3DbUFO4VX8jCrH55oruMP+s="; + "desktopYarnHash" = "044sjxpd86zhmd0wcqmsnjvrh1krspp2qd9xzlxii4zwm9jz1hxn"; + "webSrcHash" = "sha256-6BzqETzQL4Xi4YqSyjFmIgajPPpagTS4tYhOZrEfEpo="; + "webYarnHash" = "1aw40r44dvl43bfgl2cr52hdj833maq2xyg3xa49837m7lf6pr8c"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index b24b0d7b71ba..980e22c0c3e3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, prefetch-yarn-deps, 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 ]; + nativeBuildInputs = [ nodejs python3 yarn prefetch-yarn-deps ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; npm_config_nodedir = nodejs; @@ -33,7 +33,7 @@ in rustPlatform.buildRustPackage rec { export HOME=$PWD/tmp mkdir -p $HOME yarn config --offline set yarn-offline-mirror $yarnOfflineCache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/neon build --release diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix deleted file mode 100644 index bcf715682c19..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, cargo -, meson -, ninja -, rustPlatform -, rustc -, pkg-config -, glib -, gtk4 -, gtksourceview5 -, libadwaita -, gstreamer -, gst-plugins-base -, gst-plugins-bad -, desktop-file-utils -, appstream-glib -, openssl -, pipewire -, libshumate -, wrapGAppsHook4 -, sqlite -, xdg-desktop-portal -}: - -stdenv.mkDerivation rec { - pname = "fractal-next"; - version = "5.beta2"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "fractal"; - rev = version; - hash = "sha256-/BO+TlhLhi7BGsHq8aOpYw8AqNrJT0IJZOc1diq2Rys="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "matrix-sdk-0.6.2" = "sha256-A1oKNbEx2A6WwvYcNSW53Fd6QWwr0QFJtrsJXO2KInE="; - "ruma-0.8.2" = "sha256-kCGS7ACFGgmtTUElLJQMYfjwJ3glF7bRPZYJIFcuPtc="; - "curve25519-dalek-4.0.0" = "sha256-sxEFR6lsX7t4u/fhWd6wFMYETI2egPUbjMeBWkB289E="; - "vodozemac-0.4.0" = "sha256-TCbWJ9bj/FV3ILWUTcksazel8ESTNTiDGL7kGlEGvow="; - }; - }; - - nativeBuildInputs = [ - glib - gtk4 - meson - ninja - pkg-config - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - cargo - rustc - desktop-file-utils - appstream-glib - wrapGAppsHook4 - ]; - - buildInputs = [ - glib - gstreamer - gst-plugins-base - gst-plugins-bad - gtk4 - gtksourceview5 - libadwaita - openssl - pipewire - libshumate - sqlite - xdg-desktop-portal - ]; - - meta = with lib; { - description = "Matrix group messaging app (development version)"; - homepage = "https://gitlab.gnome.org/GNOME/fractal"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]); - mainProgram = "fractal"; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock index 4f099a9581c5..d1771a9c5bc9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock @@ -3,58 +3,76 @@ 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.6.0" +name = "aead" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "aes-soft", - "aesni", - "cipher", + "crypto-common", + "generic-array", ] [[package]] -name = "aes-soft" -version = "0.6.4" +name = "aes" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ + "cfg-if", "cipher", - "opaque-debug", + "cpufeatures", + "zeroize", ] [[package]] -name = "aesni" -version = "0.10.0" +name = "ahash" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ - "cipher", - "opaque-debug", + "cfg-if", + "once_cell", + "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "ammonia" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" dependencies = [ - "html5ever 0.26.0", + "html5ever", "maplit", "once_cell", "tendril", @@ -62,6 +80,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.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -71,201 +95,542 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" + +[[package]] +name = "aquamarine" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" dependencies = [ - "winapi 0.3.9", + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "anyhow" -version = "1.0.69" +name = "arrayref" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "as_variant" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" + +[[package]] +name = "ashpd" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "libc", + "once_cell", + "pipewire", + "rand", + "serde", + "serde_repr", + "tokio", + "tracing", + "url", + "zbus", +] + +[[package]] +name = "assign" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" + +[[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 = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ - "bytes 0.5.6", "flate2", "futures-core", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", + "tokio", ] [[package]] -name = "atk" -version = "0.8.0" +name = "async-io" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444daefa55f229af145ea58d77efd23725024ee1f6f3102743709aa6b18c663e" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "atk-sys", - "bitflags", - "glib", - "glib-sys", - "gobject-sys", - "libc", + "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 = "atk-sys" -version = "0.9.1" +name = "async-io" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", + "async-lock 3.0.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys", ] [[package]] -name = "atty" -version = "0.2.14" +name = "async-lock" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" +dependencies = [ + "event-listener 3.0.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-once-cell" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" + +[[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.0.1", + "futures-lite 1.13.0", + "rustix 0.38.21", + "windows-sys", +] + +[[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-rx" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a30de4e5329a0947e389f738a6ca0d0b938fea5cb7baaeae7d72e243614468a2" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[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.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.21", + "signal-hook-registry", + "slab", + "windows-sys", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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 = "async_cell" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "834eee9ce518130a3b4d5af09ecc43e9d6b57ee76613f227a1ddd6b77c7a62bc" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomic_refcell" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + +[[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 = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] name = "base64" -version = "0.13.1" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] -name = "bincode" -version = "1.3.3" +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "serde", + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.39", ] [[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" + +[[package]] +name = "bitmaps" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" + +[[package]] +name = "blake3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[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.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] -name = "block-buffer" -version = "0.10.3" +name = "block-padding" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ "generic-array", ] [[package]] -name = "block-modes" -version = "0.7.0" +name = "blocking" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ - "block-padding", - "cipher", + "async-channel", + "async-lock 2.8.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 1.13.0", + "piper", + "tracing", ] [[package]] -name = "block-padding" -version = "0.2.1" +name = "bs58" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] -name = "byteorder" -version = "1.4.3" +name = "bytemuck" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] -name = "bytes" -version = "0.4.12" +name = "byteorder" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "0.5.6" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] -name = "bytes" -version = "1.4.0" +name = "bytesize" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.8.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157049ba9618aa3a61c39d5d785102c04d3b1f40632a706c621a9aedc21e6084" +checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cairo-sys-rs", "glib", - "glib-sys", - "gobject-sys", "libc", + "once_cell", + "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.9.2" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", - "pkg-config", + "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.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] -name = "cfg-if" -version = "0.1.10" +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +dependencies = [ + "smallvec", + "target-lexicon", +] [[package]] name = "cfg-if" @@ -274,73 +639,133 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg-vis" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a2c3bf5fc10fe2ca157564fbe08a4cb2b0a7d2ff3fe2f9683e65d5e7c7859c" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "checked_int_cast" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" + +[[package]] name = "chrono" -version = "0.4.23" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time", "wasm-bindgen", - "winapi 0.3.9", + "windows-targets", ] [[package]] name = "cipher" -version = "0.2.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", + "zeroize", ] [[package]] -name = "clap" -version = "2.34.0" +name = "clang-sys" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", + "glob", + "libc", + "libloading", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "termcolor", - "unicode-width", + "crossbeam-utils", ] [[package]] -name = "comrak" -version = "0.7.0" +name = "const-oid" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17058cc536cf290563e88787d7b9e6030ce4742943017cc2ffb71f88034021c" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "const_panic" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" dependencies = [ - "clap", - "entities", - "lazy_static", - "pest", - "pest_derive", - "regex", - "twoway", - "typed-arena", - "unicode_categories", + "unicode-segmentation", ] [[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" + +[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -352,15 +777,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -371,7 +796,68 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", +] + +[[package]] +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-bigint" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", ] [[package]] @@ -381,150 +867,478 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] [[package]] -name = "crypto-mac" -version = "0.10.1" +name = "ctr" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "generic-array", + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", + "serde", "subtle", + "zeroize", ] [[package]] -name = "cxx" -version = "1.0.91" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] -name = "cxx-build" -version = "1.0.91" +name = "darling" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", "proc-macro2", "quote", - "scratch", - "syn", + "strsim", + "syn 1.0.109", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.91" +name = "darling_core" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", +] [[package]] -name = "cxxbridge-macro" -version = "1.0.91" +name = "darling_macro" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" +dependencies = [ + "tokio", +] + +[[package]] +name = "deadpool-sqlite" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4378b597d51ce5586885f99c9c9dfd15bf39638c032b74739355cf11fc6ed3" +dependencies = [ + "deadpool", + "deadpool-sync", + "rusqlite", +] + +[[package]] +name = "deadpool-sync" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8db70494c13cae4ce67b4b4dafdaf828cf0df7237ab5b9e2fcabee4965d0a0a" +dependencies = [ + "deadpool-runtime", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "der_derive", + "flagset", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] -name = "dbus" -version = "0.2.3" +name = "deranged" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a0c10ea61042b7555729ab0608727bbbb06ce709c11e6047cfa4e10f6d052d" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ - "libc", + "powerfmt", + "serde", ] [[package]] -name = "digest" -version = "0.9.0" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "generic-array", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", + "const-oid", "crypto-common", + "subtle", ] [[package]] -name = "directories" -version = "2.0.2" +name = "displaydoc" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] -name = "dirs" -version = "2.0.2" +name = "djb_hash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" + +[[package]] +name = "dyn-clone" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "ecdsa" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] -name = "dirs-sys" -version = "0.3.7" +name = "ed25519" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", + "pkcs8", + "serde", + "signature", ] [[package]] -name = "either" -version = "1.5.99" -source = "git+https://github.com/danigm/either.git?rev=60c99bc0723491e2dfd42bbe9b485c5f9323e96b#60c99bc0723491e2dfd42bbe9b485c5f9323e96b" +name = "ed25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", "serde", + "sha2", + "zeroize", ] [[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 = "elliptic-curve" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ - "cfg-if 1.0.0", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] -name = "entities" +name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys", +] + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.0.1", + "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 = "eyeball" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42482893d982111055ce4b24234d6250396d3785767c6b04cedd84612a0b80fb" +dependencies = [ + "futures-core", + "readlock", + "tracing", +] + +[[package]] +name = "eyeball-im" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "021fab29d9670be5867b16d56a95c29a12c3c1bb654e7d589010a028716d625d" +dependencies = [ + "futures-core", + "imbl", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "eyeball-im-util" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "191adac85d269e80f4e44c2b3e8fc2b193b2e3574a997962066b5980cab1fcc1" +dependencies = [ + "eyeball-im", + "futures-core", + "imbl", + "pin-project-lite", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" @@ -536,16 +1350,72 @@ dependencies = [ ] [[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 = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" + +[[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 = "flagset" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" + +[[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", ] [[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin 0.9.8", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -568,99 +1438,64 @@ 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", ] [[package]] -name = "fractal-gtk" -version = "4.4.2" +name = "fractal" +version = "5.0.0" dependencies = [ - "anyhow", - "cairo-rs", - "chrono", - "clap", - "comrak", - "directories", - "dirs", - "either 1.5.99", - "fractal-matrix-api", - "fragile 1.2.2", - "gdk", - "gdk-pixbuf", + "ashpd", + "djb_hash", + "eyeball-im", + "futures-channel", + "futures-util", + "geo-uri", "gettext-rs", - "gio", - "glib", - "gspell", + "gst-plugin-gtk4", "gstreamer", + "gstreamer-base", "gstreamer-pbutils", - "gstreamer-player", - "gtk", + "gstreamer-play", + "gstreamer-video", + "gtk4", + "html-escape", "html2pango", - "itertools", - "lazy_static", - "letter-avatar", - "libhandy", - "log", - "loggerv", - "md5", - "mdl", - "pango", - "rand 0.7.3", + "html5gum", + "image 0.24.7", + "indexmap 2.1.0", + "libadwaita", + "libshumate", + "matrix-sdk", + "matrix-sdk-ui", + "mime", + "mime_guess", + "once_cell", + "oo7", + "pulldown-cmark", + "qrcode", + "rand", "regex", - "secret-service", - "serde", - "serde_json", - "sourceview4", -] - -[[package]] -name = "fractal-matrix-api" -version = "4.4.2" -dependencies = [ - "gio", - "reqwest", - "ruma-identifiers", + "rmp-serde", + "rqrr", + "ruma", + "secular", "serde", "serde_json", + "sourceview5", + "strum", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", "url", ] [[package]] -name = "fragile" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7464c5c4a3f014d9b2ec4073650e5c06596f385060af740fc45ad5a19f959e8" -dependencies = [ - "fragile 2.0.0", -] - -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] name = "futf" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -672,9 +1507,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -687,9 +1522,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -697,15 +1532,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -714,38 +1549,63 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +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 = [ + "futures-core", + "pin-project-lite", +] [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -754,64 +1614,94 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", "slab", ] [[package]] -name = "gdk" -version = "0.12.1" +name = "fuzzy-matcher" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e8772fc0865c52460cdd7a59d7d47700f44d9809d1dd00eecceb769a7589" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" dependencies = [ - "bitflags", - "cairo-rs", - "cairo-sys-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "libc", - "pango", + "thread_local", ] [[package]] +name = "g2gen" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2c7625b2fc250dd90b63f7887a6bb0f7ec1d714c8278415bea2669ef20820e" +dependencies = [ + "g2poly", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "g2p" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc36d9bdc3d2da057775a9f4fa7d7b09edab3e0eda7a92cc353358fa63b8519e" +dependencies = [ + "g2gen", + "g2poly", +] + +[[package]] +name = "g2poly" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" + +[[package]] name = "gdk-pixbuf" -version = "0.8.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e248220c46b329b097d4b158d2717f8c688f16dd76d0399ace82b3e98062bdd7" +checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" dependencies = [ "gdk-pixbuf-sys", "gio", - "gio-sys", "glib", - "glib-sys", - "gobject-sys", "libc", + "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.9.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] -name = "gdk-sys" -version = "0.9.1" +name = "gdk4" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -821,44 +1711,84 @@ dependencies = [ "libc", "pango-sys", "pkg-config", + "system-deps", +] + +[[package]] +name = "gdk4-win32" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe66650c41f64e41ada9f85c4bdb96e5549c669e594892240dfb147a63256057" +dependencies = [ + "gdk4", + "gdk4-win32-sys", + "gio", + "glib", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4-win32-sys" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b5c187546cd3ad9f1787b46c66272d8fcdf8197bfe4f6e2647fe910c39e396d" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "glib-sys", + "libc", + "system-deps", ] [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] -name = "getrandom" -version = "0.1.16" +name = "geo-uri" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "a6b8812a079cb4a3b5b366c2d05db8e231e2f231c443acb3532daad996d89f71" dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "derive_builder", + "thiserror", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] name = "gettext-rs" -version = "0.4.2" -source = "git+https://github.com/danigm/gettext-rs?branch=no-gettext#61938b9f5f1d3bdc31f9839f53fabe5ccf136a78" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" dependencies = [ "gettext-sys", "locale_config", @@ -866,200 +1796,370 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.19.9" -source = "git+https://github.com/danigm/gettext-rs?branch=no-gettext#61938b9f5f1d3bdc31f9839f53fabe5ccf136a78" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" dependencies = [ "cc", + "temp-dir", ] [[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] name = "gio" -version = "0.8.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd10f9415cce39b53f8024bf39a21f84f8157afa52da53837b102e585a296a5" +checksum = "47d809baf02bdf1b5ef4ad3bf60dd9d4977149db4612b7bbb58e56aef168193b" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", "futures-util", "gio-sys", "glib", - "glib-sys", - "gobject-sys", - "lazy_static", "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", ] [[package]] name = "gio-sys" -version = "0.9.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", "libc", - "pkg-config", + "system-deps", + "winapi", ] [[package]] name = "glib" -version = "0.9.3" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" +checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" dependencies = [ - "bitflags", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", + "gio-sys", + "glib-macros", "glib-sys", "gobject-sys", - "lazy_static", "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +dependencies = [ + "heck", + "proc-macro-crate 2.0.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] name = "glib-sys" -version = "0.9.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", - "pkg-config", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", ] [[package]] name = "gobject-sys" -version = "0.9.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] -name = "gspell" -version = "0.4.0" +name = "graphene-rs" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136ad90e68e47a557d810de64a8c3fd1be7d68ae28c048b1bb1e37d8cc359183" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ - "gdk", - "gdk-sys", - "gio", - "gio-sys", "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +dependencies = [ "glib-sys", - "gobject-sys", - "gspell-sys", - "gtk", - "gtk-sys", "libc", + "pkg-config", + "system-deps", ] [[package]] -name = "gspell-sys" -version = "0.4.0" +name = "group" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c3039436856b04c39293eed099e3021c08327f500a12e74a5dc8cf6ad55561f" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "gsk4" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", "glib-sys", "gobject-sys", - "gtk-sys", + "graphene-sys", "libc", - "pkg-config", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gst-plugin-gtk4" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac4afae10b2ba4fd375e8a4e13ffe1e29b1b19831132317d89f03960c1a1d3c" +dependencies = [ + "gdk4-win32", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-base", + "gstreamer-gl", + "gstreamer-video", + "gtk4", + "windows-sys", +] + +[[package]] +name = "gst-plugin-version-helper" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334c37a15ca23861ad8159c8ff6e20f011aa2000defc5c9159096a28842f811b" +dependencies = [ + "chrono", + "toml_edit 0.20.7", ] [[package]] name = "gstreamer" -version = "0.15.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" +checksum = "b369a1eb2f7db49920d3d590bd988c5fb56dbf2347e1efb60307fe953546ee5d" dependencies = [ - "bitflags", - "cfg-if 0.1.10", + "cfg-if", "futures-channel", "futures-core", "futures-util", "glib", - "glib-sys", - "gobject-sys", "gstreamer-sys", - "lazy_static", + "itertools 0.11.0", "libc", "muldiv", - "num-rational 0.2.4", + "num-integer", + "num-rational 0.4.1", + "option-operations", "paste", + "pretty-hex", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-audio" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba605da8e756873456eebb35184d2c2f2b2ead7af18c5bfdc6c012d6cf8b6ee" +dependencies = [ + "cfg-if", + "glib", + "gstreamer", + "gstreamer-audio-sys", + "gstreamer-base", + "libc", ] [[package]] name = "gstreamer-audio-sys" -version = "0.8.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc91f53eec49fc31d6e0aea7502c4c4b502a4164e351b97fe81677f8a0ebce7" +checksum = "78bd94ae8b177377855b38c3d809c686526786cdb771e6d68510509634b955d1" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-base" -version = "0.15.4" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42552f75cc6c260b0be180d5c955f4cd74bd170289c622404c25f1210b521c12" +checksum = "0fe38a6d5c1e516ce3fd6069e972a540d315448ed69fdadad739e6c6c6eb2a01" dependencies = [ - "bitflags", + "atomic_refcell", + "cfg-if", "glib", - "glib-sys", - "gobject-sys", "gstreamer", "gstreamer-base-sys", - "gstreamer-sys", "libc", ] [[package]] name = "gstreamer-base-sys" -version = "0.8.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed" +checksum = "f4ca701f9078fe115b29b24c80910b577f9cb5b039182f050dbadf5933594b64" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] -name = "gstreamer-pbutils" -version = "0.15.1" +name = "gstreamer-gl" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed246c95b8fe250a2897968e7f4f2c3a1177353e9bf2e609ca90d74022da10e1" +checksum = "5caa903b631a00d7748efc3906d9108678162c5e15b87f83868d95ee85951613" dependencies = [ - "bitflags", "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-gl-sys", + "gstreamer-video", + "libc", +] + +[[package]] +name = "gstreamer-gl-sys" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba5f511a1c0b4693b9f01b2d6b7dd7f1b5b476a16b8b25a89f4265e8108c34" +dependencies = [ "glib-sys", "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-pbutils" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9614fc19b7bed81233e9e2142a59a6bb6a03a2006b7a6361a61d467619c56e4" +dependencies = [ + "glib", "gstreamer", + "gstreamer-audio", "gstreamer-pbutils-sys", - "gstreamer-sys", + "gstreamer-video", "libc", + "thiserror", ] [[package]] name = "gstreamer-pbutils-sys" -version = "0.8.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb7a9e68b2e09fa2889119ea4243c1cce83008a92d25d78f9324495707d8de8" +checksum = "6faae6e3454bc8ca5986d7ef6477fc44b809bfc952a8680eaedb4f2e001f9d69" dependencies = [ "glib-sys", "gobject-sys", @@ -1067,150 +2167,157 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] -name = "gstreamer-player" -version = "0.15.5" +name = "gstreamer-play" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04b3497c644f0e4fa92195930801baabbae74ddb208a2a9f2127f36bf4d8f698" +checksum = "f55c41b4a9c101dff739f8230a2d92cd0fddb8313cc82887fbae0a723b240871" dependencies = [ - "bitflags", "glib", - "glib-sys", - "gobject-sys", "gstreamer", - "gstreamer-player-sys", - "gstreamer-sys", + "gstreamer-play-sys", "gstreamer-video", "libc", ] [[package]] -name = "gstreamer-player-sys" -version = "0.8.1" +name = "gstreamer-play-sys" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc38a730aed3442cad1c8df589b4abe856d14671058df7099a5a030fd61413c" +checksum = "9cc41f9524b98e49da474696abd8fc026b0accfea7fd754e5be09107cb96038f" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-sys" -version = "0.8.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db" +checksum = "f86bf9de67a6ab7af67ac11588f4939e984a936030437219f269fe969d79ad8c" dependencies = [ "glib-sys", "gobject-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-video" -version = "0.15.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad7e69a940246d41428c72072a376785716b3669da333cbee1156fd90574dc9" +checksum = "01b4d3141362b3d44a684e697d2bc55fea73d023315449cda83f0f4324531d64" dependencies = [ - "bitflags", + "cfg-if", "futures-channel", - "futures-util", "glib", - "glib-sys", - "gobject-sys", "gstreamer", "gstreamer-base", - "gstreamer-base-sys", - "gstreamer-sys", "gstreamer-video-sys", - "lazy_static", "libc", ] [[package]] name = "gstreamer-video-sys" -version = "0.8.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f4298f842f4b4581606e13cf52e1710e2130d989bb99161a5665aa3ccb7cc" +checksum = "09cdc36baab839921b05d2468524da649f373dccc5f966c75e564029dc135b1c" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] -name = "gtk" -version = "0.8.1" +name = "gtk4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e1e8d70290239c668594002d1b174fcc7d7ef5d26670ee141490ede8facf8f" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ - "atk", - "bitflags", "cairo-rs", - "cairo-sys-rs", - "cc", - "gdk", + "field-offset", + "futures-channel", "gdk-pixbuf", - "gdk-pixbuf-sys", - "gdk-sys", + "gdk4", "gio", - "gio-sys", "glib", - "glib-sys", - "gobject-sys", - "gtk-sys", - "lazy_static", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", "libc", "pango", - "pango-sys", ] [[package]] -name = "gtk-sys" -version = "0.9.2" +name = "gtk4-macros" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "gtk4-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ - "atk-sys", "cairo-sys-rs", "gdk-pixbuf-sys", - "gdk-sys", + "gdk4-sys", "gio-sys", "glib-sys", "gobject-sys", + "graphene-sys", + "gsk4-sys", "libc", "pango-sys", - "pkg-config", + "system-deps", ] [[package]] name = "h2" -version = "0.2.7" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "futures-core", "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", "tracing", - "tracing-futures", +] + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", ] [[package]] @@ -1220,118 +2327,180 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "heck" -version = "0.3.3" +name = "hashbrown" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "unicode-segmentation", + "ahash", ] [[package]] -name = "hermit-abi" -version = "0.1.19" +name = "hashbrown" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "libc", + "ahash", + "allocator-api2", ] [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "hashlink" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "libc", + "hashbrown 0.14.2", +] + +[[package]] +name = "hdrhistogram" +version = "7.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +dependencies = [ + "byteorder", + "num-traits", +] + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] name = "hkdf" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" dependencies = [ - "digest 0.9.0", "hmac", ] [[package]] name = "hmac" -version = "0.10.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac", - "digest 0.9.0", + "digest", +] + +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", ] [[package]] name = "html2pango" -version = "0.3.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469b284033c3c93e7df758d316cb2e0da4408e4138d5add903b8be356a841738" +checksum = "a5f061cc3c0538033f81a94417f209e2b1908e3dab8b87b205d84e6109c8091b" dependencies = [ "ammonia", "anyhow", - "html5ever 0.25.2", - "lazy_static", + "html5ever", "linkify", "maplit", "markup5ever_rcdom", + "once_cell", "regex", ] [[package]] name = "html5ever" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", - "markup5ever 0.10.1", + "markup5ever", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "html5ever" -version = "0.26.0" +name = "html5gum" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "4c4e556171a058ba117bbe88b059fb37b6289023e007d2903ea6dca3a3cbff14" dependencies = [ - "log", - "mac", - "markup5ever 0.11.0", - "proc-macro2", - "quote", - "syn", + "jetscii", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", - "itoa 1.0.5", + "itoa", ] [[package]] name = "http-body" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 0.5.6", + "bytes", "http", + "pin-project-lite", ] [[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + +[[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1339,17 +2508,17 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "0.3.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.13.10" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -1358,9 +2527,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.8", - "pin-project", - "socket2", + "itoa", + "pin-project-lite", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1368,60 +2537,191 @@ dependencies = [ ] [[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", +] + +[[package]] name = "hyper-tls" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 0.5.6", + "bytes", "hyper", "native-tls", "tokio", - "tokio-tls", + "tokio-native-tls", ] [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi 0.3.9", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] +name = "image" +version = "0.23.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-iter", + "num-rational 0.3.2", + "num-traits", +] + +[[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 0.4.1", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imbl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085" +dependencies = [ + "bitmaps", + "imbl-sized-chunks", + "rand_core", + "rand_xoshiro", + "serde", + "version_check", +] + +[[package]] +name = "imbl-sized-chunks" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076" +dependencies = [ + "bitmaps", +] + +[[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 = "indexed_db_futures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfbcff6ae46750b15cc594bfd277b188cbddcfdc1817848f97f03f26f8625b9e" +dependencies = [ + "cfg-if", + "js-sys", + "uuid", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "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.2", + "serde", +] + +[[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]] @@ -1430,62 +2730,146 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "iovec" -version = "0.1.4" +name = "io-lifetimes" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi", "libc", + "windows-sys", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "iri-string" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0" +dependencies = [ + "memchr", + "serde", +] [[package]] name = "itertools" -version = "0.8.2" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ - "either 1.8.1", + "either", ] [[package]] -name = "itoa" -version = "0.4.8" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jetscii" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" + +[[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.61" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] [[package]] -name = "kernel32-sys" +name = "js_int" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" +dependencies = [ + "serde", +] + +[[package]] +name = "js_option" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +dependencies = [ + "serde", +] + +[[package]] +name = "k256" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "konst" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030400e39b2dff8beaa55986a17e0014ad657f569ca92426aafcb5e8e71faee7" +dependencies = [ + "const_panic", + "konst_kernel", + "typewit", +] + +[[package]] +name = "konst_kernel" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3376133edc39f027d551eb77b077c2865a0ef252b2e7d0dd6b6dc303db95d8b5" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "typewit", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" +dependencies = [ + "serde", ] [[package]] @@ -1493,121 +2877,184 @@ 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 = "letter-avatar" -version = "1.2.1" +name = "lazycell" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8da3ec7b8a44be82e431a90a01b339cc78690db204d1d372cb0883c99a71602" -dependencies = [ - "cairo-rs", - "pango", - "pangocairo", - "unicode-segmentation", -] +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libc" -version = "0.2.139" +name = "lebe" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] -name = "libhandy" -version = "0.5.0" +name = "libadwaita" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aa9f5620e4143358bcd645fe7d7d27b974ed9148cbdd490bc811813899afa07" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ - "bitflags", - "gdk", - "gdk-sys", + "gdk-pixbuf", + "gdk4", "gio", - "gio-sys", "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "lazy_static", + "gtk4", + "libadwaita-sys", "libc", - "libhandy-sys", "pango", ] [[package]] -name = "libhandy-sys" -version = "0.5.0" +name = "libadwaita-sys" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d707af842e918719b71af0ac6cf31d1843f6e8a4d1e9c733b998d8d482e60446" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ - "gdk", - "gdk-sys", - "gio", + "gdk4-sys", "gio-sys", "glib-sys", "gobject-sys", - "gtk-sys", + "gtk4-sys", "libc", "pango-sys", - "pkg-config", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[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 = "link-cplusplus" -version = "1.0.8" +name = "libm" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libshumate" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b743d27ff75bbd10e97729e771fa706f0e2e80503f8b737c7ebd39abd6ed1b2d" dependencies = [ - "cc", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "libshumate-sys", ] [[package]] -name = "linkify" +name = "libshumate-sys" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03951527dd24d2c59f407502e7d88e0948ef06fac23335b556a4c2bc03c22096" +checksum = "c2d267a8d525823ad53986bde3b56ed6ef8c319227b33fc71028daed41ea5103" dependencies = [ - "memchr", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "system-deps", ] [[package]] -name = "lmdb" -version = "0.8.0" +name = "libspa" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0908efb5d6496aa977d96f91413da2635a902e5e31dbef0bfb88986c248539" +checksum = "0434617020ddca18b86067912970c55410ca654cdafd775480322f50b857a8c4" dependencies = [ - "bitflags", + "bitflags 2.4.1", + "cc", + "convert_case", + "cookie-factory", "libc", - "lmdb-sys", + "libspa-sys", + "nix", + "nom", + "system-deps", ] [[package]] -name = "lmdb-sys" -version = "0.8.0" +name = "libspa-sys" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b392838cfe8858e86fac37cf97a0e8c55cc60ba0a18365cadc33092f128ce9" +checksum = "b3e70ca3f3e70f858ef363046d06178c427b4e0b63d210c95fd87d752679d345" dependencies = [ + "bindgen", "cc", - "libc", + "system-deps", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ "pkg-config", + "vcpkg", ] [[package]] +name = "linkify" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5" +dependencies = [ + "memchr", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] name = "locale_config" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" dependencies = [ "lazy_static", + "objc", + "objc-foundation", "regex", - "winapi 0.3.9", + "winapi", ] [[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", @@ -1615,22 +3062,17 @@ dependencies = [ [[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 = "loggerv" -version = "0.7.2" +name = "lru" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d8de15ae71e760bce7f05447f85f73624fe0d3b1e4c5a63ba5d4cb0748d374" +checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" dependencies = [ - "ansi_term", - "atty", - "log", + "hashbrown 0.13.2", ] [[package]] @@ -1640,6 +3082,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] name = "maplit" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1647,73 +3098,494 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", - "phf 0.8.0", - "phf_codegen 0.8.0", + "phf 0.10.1", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", ] [[package]] -name = "markup5ever" -version = "0.11.0" +name = "markup5ever_rcdom" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", + "html5ever", + "markup5ever", "tendril", + "xml5ever", ] [[package]] -name = "markup5ever_rcdom" +name = "mas-http" +version = "0.5.0-rc.2" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608" +dependencies = [ + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "mas-tower", + "once_cell", + "opentelemetry", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tower", + "tower-http", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "mas-iana" +version = "0.5.0-rc.2" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608" +dependencies = [ + "schemars", + "serde", +] + +[[package]] +name = "mas-jose" +version = "0.5.0-rc.2" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608" +dependencies = [ + "base64ct", + "chrono", + "digest", + "ecdsa", + "elliptic-curve", + "generic-array", + "hmac", + "k256", + "mas-iana", + "p256", + "p384", + "rand", + "rsa", + "schemars", + "sec1", + "serde", + "serde_json", + "serde_with", + "sha2", + "signature", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "mas-keystore" +version = "0.5.0-rc.2" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608" +dependencies = [ + "aead", + "base64ct", + "chacha20poly1305", + "const-oid", + "der", + "ecdsa", + "elliptic-curve", + "generic-array", + "k256", + "mas-iana", + "mas-jose", + "p256", + "p384", + "pem-rfc7468", + "pkcs1", + "pkcs8", + "rand", + "rsa", + "sec1", + "spki", + "thiserror", +] + +[[package]] +name = "mas-oidc-client" +version = "0.5.0-rc.2" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608" +dependencies = [ + "base64ct", + "bytes", + "chrono", + "form_urlencoded", + "futures", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "hyper-rustls", + "language-tags", + "mas-http", + "mas-iana", + "mas-jose", + "mas-keystore", + "mime", + "oauth2-types", + "once_cell", + "rand", + "rustls", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "thiserror", + "tokio", + "tower", + "tower-http", + "tracing", + "url", +] + +[[package]] +name = "mas-tower" +version = "0.5.0-rc.2" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608" +dependencies = [ + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-semantic-conventions", + "pin-project-lite", + "tokio", + "tower", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "html5ever 0.25.2", - "markup5ever 0.10.1", - "tendril", - "xml5ever", + "regex-automata 0.1.10", ] [[package]] -name = "md5" -version = "0.7.0" +name = "matrix-pickle" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" +checksum = "d7fd26463ce5d86b8d9bb9c4142d453198ba22fb91bd46d3c9f144ae699d821d" +dependencies = [ + "matrix-pickle-derive", + "thiserror", +] [[package]] -name = "mdl" -version = "1.0.5" +name = "matrix-pickle-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9408becfeee133226be6df86aee4018565e6e26f746510467d0f5a0f38bc5bd5" +checksum = "93779aa78d39c2fe34746287b10a866192cf8af1b81767fff76bd64099acc0f5" +dependencies = [ + "proc-macro-crate 2.0.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "matrix-sdk" +version = "0.6.2" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "anymap2", + "aquamarine", + "as_variant", + "async-channel", + "async-stream", + "async-trait", + "backoff", + "bytes", + "bytesize", + "cfg-vis", + "chrono", + "event-listener 3.0.1", + "eyeball", + "eyeball-im", + "eyeball-im-util", + "futures-core", + "futures-util", + "gloo-timers", + "http", + "hyper", + "image 0.24.7", + "imbl", + "indexmap 2.1.0", + "language-tags", + "mas-oidc-client", + "matrix-sdk-base", + "matrix-sdk-common", + "matrix-sdk-indexeddb", + "matrix-sdk-sqlite", + "mime", + "mime2ext", + "rand", + "reqwest", + "ruma", + "serde", + "serde_html_form", + "serde_json", + "sha2", + "tempfile", + "thiserror", + "tokio", + "tokio-util", + "tower", + "tracing", + "url", + "urlencoding", + "zeroize", +] + +[[package]] +name = "matrix-sdk-base" +version = "0.6.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "as_variant", + "async-trait", + "bitflags 2.4.1", + "eyeball", + "futures-util", + "matrix-sdk-common", + "matrix-sdk-crypto", + "matrix-sdk-store-encryption", + "once_cell", + "ruma", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "matrix-sdk-common" +version = "0.6.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "async-trait", + "futures-core", + "futures-util", + "gloo-timers", + "instant", + "ruma", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "matrix-sdk-crypto" +version = "0.6.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "aes", + "as_variant", + "async-trait", + "bs58", + "byteorder", + "cbc", + "cfg-if", + "ctr", + "eyeball", + "futures-core", + "futures-util", + "hkdf", + "hmac", + "itertools 0.11.0", + "matrix-sdk-common", + "matrix-sdk-qrcode", + "pbkdf2", + "rand", + "rmp-serde", + "ruma", + "serde", + "serde_json", + "sha2", + "subtle", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "ulid", + "vodozemac", + "zeroize", +] + +[[package]] +name = "matrix-sdk-indexeddb" +version = "0.2.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" dependencies = [ "anyhow", - "bincode", - "lmdb", + "async-trait", + "base64", + "getrandom", + "gloo-utils", + "indexed_db_futures", + "js-sys", + "matrix-sdk-base", + "matrix-sdk-crypto", + "matrix-sdk-store-encryption", + "ruma", + "serde", + "serde-wasm-bindgen", + "serde_json", + "thiserror", + "tokio", + "tracing", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "matrix-sdk-qrcode" +version = "0.4.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "byteorder", + "qrcode", + "ruma-common", + "thiserror", + "vodozemac", +] + +[[package]] +name = "matrix-sdk-sqlite" +version = "0.1.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "async-trait", + "deadpool-sqlite", + "itertools 0.11.0", + "matrix-sdk-base", + "matrix-sdk-crypto", + "matrix-sdk-store-encryption", + "rmp-serde", + "ruma", + "rusqlite", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "vodozemac", +] + +[[package]] +name = "matrix-sdk-store-encryption" +version = "0.2.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "blake3", + "chacha20poly1305", + "displaydoc", + "getrandom", + "hmac", + "pbkdf2", + "rand", + "rmp-serde", + "serde", + "serde_json", + "sha2", + "thiserror", + "zeroize", +] + +[[package]] +name = "matrix-sdk-ui" +version = "0.6.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758" +dependencies = [ + "as_variant", + "async-once-cell", + "async-rx", + "async-stream", + "async-trait", + "async_cell", + "chrono", + "eyeball", + "eyeball-im", + "eyeball-im-util", + "futures-core", + "futures-util", + "fuzzy-matcher", + "imbl", + "indexmap 2.1.0", + "itertools 0.11.0", + "matrix-sdk", + "matrix-sdk-base", + "mime", + "once_cell", + "pin-project-lite", + "ruma", "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "unicode-normalization", + "url", ] [[package]] name = "memchr" -version = "2.5.0" +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 = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +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.16" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime2ext" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" [[package]] name = "mime_guess" @@ -1726,50 +3598,37 @@ 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.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] name = "mio" -version = "0.6.23" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "wasi", + "windows-sys", ] [[package]] name = "muldiv" -version = "0.2.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "native-tls" @@ -1790,41 +3649,63 @@ dependencies = [ ] [[package]] -name = "net2" -version = "0.2.38" +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 = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "cfg-if 0.1.10", + "bitflags 1.3.2", + "cfg-if", "libc", - "winapi 0.3.9", + "memoffset 0.7.1", + "pin-utils", ] [[package]] -name = "new_debug_unreachable" -version = "1.0.4" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +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" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] [[package]] name = "num" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", - "num-rational 0.3.2", + "num-rational 0.4.1", "num-traits", ] [[package]] name = "num-bigint" -version = "0.3.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1832,10 +3713,28 @@ 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", + "serde", + "smallvec", + "zeroize", +] + +[[package]] name = "num-complex" -version = "0.3.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -1863,9 +3762,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.2.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", "num-integer", @@ -1874,9 +3773,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-bigint", @@ -1886,28 +3785,114 @@ 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", ] [[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 = "oauth2-types" +version = "0.5.0-rc.2" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608" +dependencies = [ + "chrono", + "data-encoding", + "http", + "language-tags", + "mas-iana", + "mas-jose", + "parse-display", + "serde", + "serde_json", + "serde_with", + "sha2", + "thiserror", + "url", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "oo7" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" +dependencies = [ + "aes", + "byteorder", + "cbc", + "cipher", + "digest", + "futures-util", + "hkdf", + "hmac", + "num", + "num-bigint-dig", + "once_cell", + "pbkdf2", + "rand", + "serde", + "sha2", + "tokio", + "tracing", + "zbus", + "zeroize", +] [[package]] name = "opaque-debug" @@ -1917,12 +3902,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 2.4.1", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -1932,13 +3917,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] @@ -1949,11 +3934,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1961,64 +3945,162 @@ dependencies = [ ] [[package]] -name = "pango" -version = "0.8.0" +name = "opentelemetry" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c6b728f1be8edb5f9f981420b651d5ea30bdb9de89f1f1262d0084a020577" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ - "bitflags", - "glib", - "glib-sys", - "gobject-sys", - "lazy_static", - "libc", - "pango-sys", + "opentelemetry_api", + "opentelemetry_sdk", ] [[package]] -name = "pango-sys" -version = "0.9.1" +name = "opentelemetry-http" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", + "async-trait", + "bytes", + "http", + "opentelemetry_api", ] [[package]] -name = "pangocairo" -version = "0.9.0" +name = "opentelemetry-semantic-conventions" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd1077c0db2e5eb9225cc040514aa856cb6a4c4890c542cf50d37880e1c572d" +checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" dependencies = [ - "bitflags", - "cairo-rs", - "cairo-sys-rs", + "opentelemetry", +] + +[[package]] +name = "opentelemetry_api" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "ordered-float", + "percent-encoding", + "rand", + "regex", + "thiserror", +] + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "pango" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio", "glib", - "glib-sys", - "gobject-sys", "libc", - "pango", + "once_cell", "pango-sys", - "pangocairo-sys", ] [[package]] -name = "pangocairo-sys" -version = "0.10.1" +name = "pango-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3921b31ab776b23e28c8f6e474dda52fdc28bc2689101caeb362ba976719efe" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "cairo-sys-rs", "glib-sys", + "gobject-sys", "libc", - "pango-sys", - "pkg-config", + "system-deps", ] [[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2030,94 +4112,79 @@ 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 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[package]] -name = "paste" -version = "0.1.18" +name = "parse-display" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c" dependencies = [ - "paste-impl", - "proc-macro-hack", + "once_cell", + "parse-display-derive", + "regex", ] [[package]] -name = "paste-impl" -version = "0.1.18" +name = "parse-display-derive" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" dependencies = [ - "proc-macro-hack", + "once_cell", + "proc-macro2", + "quote", + "regex", + "regex-syntax 0.7.5", + "structmeta", + "syn 2.0.39", ] [[package]] -name = "percent-encoding" -version = "2.2.0" +name = "paste" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "pest" -version = "2.5.5" +name = "pbkdf2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "thiserror", - "ucd-trie", + "digest", + "hmac", ] [[package]] -name = "pest_derive" -version = "2.5.5" +name = "peeking_take_while" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" -dependencies = [ - "pest", - "pest_generator", -] +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "pest_generator" -version = "2.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.5.5" +name = "pem-rfc7468" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ - "once_cell", - "pest", - "sha2 0.10.6", + "base64ct", ] [[package]] -name = "phf" -version = "0.8.0" +name = "percent-encoding" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" @@ -2129,13 +4196,13 @@ dependencies = [ ] [[package]] -name = "phf_codegen" -version = "0.8.0" +name = "phf" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", + "phf_macros", + "phf_shared 0.11.2", ] [[package]] @@ -2150,31 +4217,35 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", + "phf_shared 0.10.0", + "rand", ] [[package]] name = "phf_generator" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", + "phf_shared 0.11.2", + "rand", ] [[package]] -name = "phf_shared" -version = "0.8.0" +name = "phf_macros" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "siphasher", + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -2187,36 +4258,39 @@ dependencies = [ ] [[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "pin-project-lite" -version = "0.1.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2225,10 +4299,164 @@ 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 = "pipewire" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2d009c8dd65e890b515a71950f7e4c801523b8894ff33863a40830bf762e9e9" +dependencies = [ + "anyhow", + "bitflags 2.4.1", + "libc", + "libspa", + "libspa-sys", + "nix", + "once_cell", + "pipewire-sys", + "thiserror", +] + +[[package]] +name = "pipewire-sys" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890c084e7b737246cb4799c86b71a0e4da536031ff7473dd639eba9f95039f64" +dependencies = [ + "bindgen", + "libspa-sys", + "system-deps", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" +dependencies = [ + "aes", + "cbc", + "der", + "pbkdf2", + "scrypt", + "sha2", + "spki", +] + +[[package]] +name = "pkcs7" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d79178be066405e0602bf3035946edef6b11b3f9dde46dfe5f8bfd7dea4b77e7" +dependencies = [ + "der", + "spki", + "x509-cert", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "pkcs5", + "rand_core", + "spki", +] + +[[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "platforms" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" + +[[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", +] + +[[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -2243,62 +4471,144 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + +[[package]] +name = "primeorder" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +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.51" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] -name = "quote" -version = "1.0.23" +name = "prost" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +dependencies = [ + "anyhow", + "itertools 0.11.0", "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] -name = "rand" -version = "0.7.3" +name = "pulldown-cmark" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", + "bitflags 1.3.2", + "getopts", + "memchr", + "unicase", ] [[package]] -name = "rand" -version = "0.8.5" +name = "qoi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "bytemuck", ] [[package]] -name = "rand_chacha" -version = "0.2.2" +name = "qrcode" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "checked_int_cast", + "image 0.23.14", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", ] [[package]] @@ -2308,214 +4618,604 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.1.16", + "getrandom", ] [[package]] -name = "rand_core" -version = "0.6.4" +name = "rand_xoshiro" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "getrandom 0.2.8", + "rand_core", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rayon" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "rand_core 0.5.1", + "either", + "rayon-core", ] [[package]] -name = "rand_pcg" -version = "0.2.1" +name = "rayon-core" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "rand_core 0.5.1", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] +name = "readlock" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2" + +[[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" +name = "regex" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] -name = "regex" -version = "1.7.1" +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 = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[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.10.10" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "async-compression", "base64", - "bytes 0.5.6", + "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", - "mime_guess", "native-tls", + "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-socks", - "tokio-tls", + "tokio-util", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "winreg", ] [[package]] -name = "ruma-identifiers" -version = "0.17.4" +name = "rfc6979" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5917092ecf88dec0a9a1f39ed5755096f39dc23003dcc278a58805ee8be65dee" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "rand 0.7.3", - "ruma-identifiers-macros", + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted", + "windows-sys", +] + +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "rqrr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a8b87d1f9f69bb1a6c77e20fd303f9617b2b68dcff87cd9bcbfff2ced4b8a0b" +dependencies = [ + "g2p", + "image 0.24.7", + "lru", +] + +[[package]] +name = "rsa" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "ruma" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc39664df66d707506b1dd318c30e600f25ebc1e7feadf4804ae45db67922c53" +dependencies = [ + "assign", + "js_int", + "js_option", + "ruma-client-api", + "ruma-common", + "ruma-events", + "ruma-federation-api", + "ruma-html", + "ruma-push-gateway-api", +] + +[[package]] +name = "ruma-client-api" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2428ee1488551cbc2bc4ef936c9452ac35ccd5c7e4e4df12c54b67afa6b262fb" +dependencies = [ + "assign", + "bytes", + "http", + "js_int", + "js_option", + "maplit", + "ruma-common", + "ruma-events", + "serde", + "serde_html_form", + "serde_json", +] + +[[package]] +name = "ruma-common" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bca4c33c50e47b4cdceeac71bdef0c04153b0e29aa992d9030ec14a62323e85" +dependencies = [ + "as_variant", + "base64", + "bytes", + "form_urlencoded", + "getrandom", + "http", + "indexmap 2.1.0", + "js-sys", + "js_int", + "konst", + "percent-encoding", + "rand", + "regex", "ruma-identifiers-validation", + "ruma-macros", "serde", - "strum", + "serde_html_form", + "serde_json", + "thiserror", + "tracing", + "url", + "uuid", + "wildmatch", ] [[package]] -name = "ruma-identifiers-macros" -version = "0.17.4" +name = "ruma-events" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "986f7ea65aac70e22fdbdadf582d51ceb4c896c0844ccf7a944a1128c2c5e30e" +checksum = "6db9e1f3be8ee402ad7fa14a9273a2192eac58b099e0e2f0fb98b7d27ba88f10" dependencies = [ + "as_variant", + "indexmap 2.1.0", + "js_int", + "js_option", + "percent-encoding", + "pulldown-cmark", + "regex", + "ruma-common", + "ruma-html", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "wildmatch", +] + +[[package]] +name = "ruma-federation-api" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1901c1f27bc327652d58af2a130c73acef3198abeccd24cee97f7267fdf3fe7" +dependencies = [ + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-html" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9674a149b1a6965fe2174ba528c89ee201258abd9209bbe74953df7073a83a5b" +dependencies = [ + "as_variant", + "html5ever", + "phf 0.11.2", + "tracing", + "wildmatch", +] + +[[package]] +name = "ruma-identifiers-validation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8ad1259274f2f57c20901bd1cc5e4a8f23169d1c1d887b6338b02f058e9b41" +dependencies = [ + "js_int", + "thiserror", +] + +[[package]] +name = "ruma-macros" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0280534a4b3e34416f883285fac4f9c408cd0b737890ae66f3e7a7056d14be80" +dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "ruma-identifiers-validation", - "syn", + "serde", + "syn 2.0.39", + "toml", ] [[package]] -name = "ruma-identifiers-validation" -version = "0.1.1" +name = "ruma-push-gateway-api" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c112fd1d537d0c9eec9ec93e098576f8c68b2eabbc64b7275b1ed28235fe605b" +checksum = "f343045c4d4a5943f93b5014160af3c7413e6ee32ea47b147e1e91f2a977486b" dependencies = [ + "js_int", + "ruma-common", + "ruma-events", "serde", - "strum", + "serde_json", +] + +[[package]] +name = "rusqlite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +dependencies = [ + "bitflags 2.4.1", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", ] [[package]] +name = "rustix" +version = "0.38.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys", +] + +[[package]] +name = "rustls" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] name = "ryu" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "schemars" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ - "windows-sys 0.42.0", + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.109", ] [[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.3" +name = "scrypt" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "pbkdf2", + "salsa20", + "sha2", +] [[package]] -name = "secret-service" -version = "1.1.3" +name = "sct" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d752040301c251d653aa740dec847e95767ce312cfc469bee85eb13cbf81d8a" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "aes", - "block-modes", - "dbus", - "hkdf", - "lazy_static", - "num", - "rand 0.7.3", - "sha2 0.9.9", + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "secular" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3dc3eccdf599b53eba8a34a1190bd47394948258d1c43dca9cceb2426e25bb5" +dependencies = [ + "unicode-normalization", ] [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2524,156 +5224,330 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", ] [[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] name = "serde" -version = "1.0.152" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_bytes" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +dependencies = [ + "serde", +] + +[[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "serde_html_form" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c" +dependencies = [ + "form_urlencoded", + "indexmap 2.1.0", + "itoa", + "ryu", + "serde", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "itoa 1.0.5", + "itoa", "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.5", + "itoa", "ryu", "serde", ] [[package]] -name = "sha2" -version = "0.9.9" +name = "serde_with" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", + "base64", + "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 0.20.3", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[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", + "cfg-if", "cpufeatures", - "digest 0.10.6", + "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 = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +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 = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[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.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.3.19" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ - "cfg-if 1.0.0", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] -name = "sourceview4" -version = "0.2.0" -source = "git+https://gitlab.gnome.org/World/Rust/sourceview4-rs.git?rev=fa8819fa7ecbe56f44d951656d3825f468915754#fa8819fa7ecbe56f44d951656d3825f468915754" +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ - "bitflags", - "cairo-rs", - "gdk", + "libc", + "windows-sys", +] + +[[package]] +name = "sourceview5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c5f976a113e947bc5ec67758b2960c0db4ca76f80fb410d7cd86cd456d9ee5" +dependencies = [ + "futures-channel", + "futures-core", "gdk-pixbuf", - "gdk-sys", + "gdk4", "gio", - "gio-sys", "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", + "gtk4", "libc", "pango", - "sourceview4-sys", + "sourceview5-sys", ] [[package]] -name = "sourceview4-sys" -version = "0.2.0" -source = "git+https://gitlab.gnome.org/World/Rust/sourceview4-rs.git?rev=fa8819fa7ecbe56f44d951656d3825f468915754#fa8819fa7ecbe56f44d951656d3825f468915754" +name = "sourceview5-sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29637cccd56075a37ba72c0cc8b8d599dbc1d857e30dadea97eaacbc29b7fd46" dependencies = [ - "cairo-sys-rs", "gdk-pixbuf-sys", - "gdk-sys", + "gdk4-sys", "gio-sys", "glib-sys", "gobject-sys", - "gtk-sys", + "gtk4-sys", "libc", - "pkg-config", + "pango-sys", + "system-deps", ] [[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] name = "string_cache" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", @@ -2697,42 +5571,66 @@ dependencies = [ [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structmeta" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.39", +] + +[[package]] +name = "structmeta-derive" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "strum" -version = "0.18.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.18.0" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "rustversion", + "syn 2.0.39", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -2740,17 +5638,73 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.3.0" +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 = "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 = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "cfg-if 1.0.0", - "fastrand", + "core-foundation-sys", "libc", +] + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", + "rustix 0.38.21", + "windows-sys", ] [[package]] @@ -2765,52 +5719,73 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "thiserror" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ - "winapi-util", + "thiserror-impl", ] [[package]] -name = "textwrap" -version = "0.11.0" +name = "thiserror-impl" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "unicode-width", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] -name = "thiserror" -version = "1.0.38" +name = "thread_local" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "thiserror-impl", + "cfg-if", + "once_cell", ] [[package]] -name = "thiserror-impl" -version = "1.0.38" +name = "tiff" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ - "proc-macro2", - "quote", - "syn", + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] name = "time" -version = "0.1.45" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "deranged", + "itoa", + "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]] @@ -2830,60 +5805,197 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "0.2.25" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "memchr", + "backtrace", + "bytes", + "libc", "mio", "num_cpus", - "pin-project-lite 0.1.12", - "slab", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "tracing", + "windows-sys", +] + +[[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.39", +] + +[[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-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", ] [[package]] name = "tokio-socks" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" dependencies = [ - "bytes 0.4.12", - "either 1.8.1", - "futures", + "either", + "futures-util", "thiserror", "tokio", ] [[package]] -name = "tokio-tls" -version = "0.3.1" +name = "tokio-stream" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ - "native-tls", + "futures-core", + "pin-project-lite", "tokio", + "tokio-util", ] [[package]] name = "tokio-util" -version = "0.3.1" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-core", "futures-sink", - "log", - "pin-project-lite 0.1.12", + "pin-project-lite", "tokio", + "tracing", ] [[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", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "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" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "hdrhistogram", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +dependencies = [ + "bitflags 2.4.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "iri-string", + "pin-project-lite", + "tokio", + "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.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2891,33 +6003,80 @@ 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 1.0.0", "log", - "pin-project-lite 0.2.9", + "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.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", ] [[package]] -name = "tracing-futures" -version = "0.2.5" +name = "tracing-log" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "pin-project", + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" +dependencies = [ + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -2927,59 +6086,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] -name = "twoway" -version = "0.2.2" +name = "typenum" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47" -dependencies = [ - "memchr", - "unchecked-index", -] +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "typed-arena" -version = "1.7.0" +name = "typewit" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" +checksum = "6779a69cc5f9a7388274a0a8a353eb1c9e45195f9ae74a26690b055a7cf9592a" +dependencies = [ + "typewit_proc_macros", +] [[package]] -name = "typenum" -version = "1.16.0" +name = "typewit_proc_macros" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" [[package]] -name = "ucd-trie" -version = "0.1.5" +name = "uds_windows" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] [[package]] -name = "unchecked-index" -version = "0.2.2" +name = "ulid" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" +dependencies = [ + "rand", +] [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -2998,21 +6163,31 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] -name = "unicode_categories" -version = "0.1.1" +name = "universal-hash" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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", @@ -3021,22 +6196,50 @@ dependencies = [ ] [[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "getrandom", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "vec_map" -version = "0.8.2" +name = "version-compare" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -3045,26 +6248,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "want" -version = "0.3.0" +name = "vodozemac" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "6c66c59f2218deeddfe34c0fee8a1908967f8566bafd91c3c6b9600d0b68cde1" dependencies = [ - "log", - "try-lock", + "aes", + "arrayvec", + "base64", + "cbc", + "curve25519-dalek", + "ed25519-dalek", + "getrandom", + "hkdf", + "hmac", + "matrix-pickle", + "pkcs7", + "prost", + "rand", + "serde", + "serde_bytes", + "serde_json", + "sha2", + "subtle", + "thiserror", + "x25519-dalek", + "zeroize", ] [[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +name = "waker-fn" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +name = "want" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] [[package]] name = "wasi" @@ -3074,38 +6299,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ - "cfg-if 1.0.0", - "serde", - "serde_json", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -3113,9 +6336,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3123,38 +6346,57 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "winapi" -version = "0.2.8" +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wildmatch" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" [[package]] name = "winapi" @@ -3167,61 +6409,40 @@ dependencies = [ ] [[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.42.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -3234,73 +6455,254 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[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.7.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.3.9", + "cfg-if", + "windows-sys", ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "x25519-dalek" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "x509-cert" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25eefca1d99701da3a57feb07e5079fc62abba059fc139e98c13bbb250f3ef29" +dependencies = [ + "const-oid", + "der", + "spki", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", ] [[package]] name = "xml5ever" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865" +checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" dependencies = [ "log", "mac", - "markup5ever 0.10.1", - "time", + "markup5ever", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-process", + "async-recursion", + "async-trait", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "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 1.3.1", + "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.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 4f92ce733e54..3c62eb2aac6b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -5,88 +5,75 @@ , cargo , meson , ninja -, gettext -, python3 , rustPlatform , rustc , pkg-config -, gtksourceview4 , glib -, libhandy_0 -, gtk3 -, dbus +, gtk4 +, gtksourceview5 +, libadwaita +, gst_all_1 +, desktop-file-utils +, appstream-glib , openssl +, pipewire +, libshumate +, wrapGAppsHook4 , sqlite -, gst_all_1 -, cairo -, gdk-pixbuf -, gspell -, wrapGAppsHook +, xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "fractal"; - version = "4.4.2"; + version = "5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "fractal"; rev = version; - hash = "sha256-/vPadtyiYDX0PdneMxc0oSWb5OYnikevqajl3WgZiGA="; + hash = "sha256-XHb8HjQ5PDL2sen6qUivDllvYEhKnp1vQynD2Lksi30="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "either-1.5.99" = "sha256-Lmv9OPZKEb7tmkN+7Mua2nx0xmZwm3d1W623UKUlPeg="; - "gettext-rs-0.4.2" = "sha256-wyZ1bf0oFcQo8gEi2GEalRUoKMoJYHysu79qcfjd4Ng="; - "sourceview4-0.2.0" = "sha256-RuCg05/qjkPri1QUd5acsGVqJtGvM5OO8/R+Nibxoa4="; + "matrix-sdk-0.6.2" = "sha256-X+4077rlaE8zjXHXPUfiYwa/+Bg0KTFrcsAg7yCz4ug="; + "mas-http-0.5.0-rc.2" = "sha256-XH+I5URcbkSY4NDwfOFhIjb+/swuGz6n9hKufziPgoY="; }; }; nativeBuildInputs = [ - gettext + glib + gtk4 meson ninja pkg-config - python3 - cargo + rustPlatform.bindgenHook rustPlatform.cargoSetupHook + cargo rustc - wrapGAppsHook - glib + desktop-file-utils + appstream-glib + wrapGAppsHook4 ]; buildInputs = [ - cairo - dbus - gdk-pixbuf glib - gspell - gst_all_1.gst-editing-services - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - (gst_all_1.gst-plugins-good.override { - gtkSupport = true; - }) - gst_all_1.gstreamer - gst_all_1.gst-devtools - gtk3 - gtksourceview4 - libhandy_0 + gtk4 + gtksourceview5 + libadwaita openssl + pipewire + libshumate sqlite - ]; - - postPatch = '' - chmod +x scripts/test.sh - patchShebangs scripts/meson_post_install.py scripts/test.sh - ''; - - preConfigure = '' - export GETTEXT_DIR="${gettext}" - ''; + xdg-desktop-portal + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-plugins-good + ]); passthru = { updateScript = nix-update-script { }; @@ -95,8 +82,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; - license = licenses.gpl3; - maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]); - platforms = platforms.unix; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]); + platforms = platforms.linux; + mainProgram = "fractal"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 89664fc333f2..458577b8d053 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-yyIs8TT6tNrqycgmYJVHdCQwUX5NlR2IHTW+Q+J9CIQ="; + hash = "sha256-WPzth7HOAbPVJpvN8zSZJGUzsBtACNlwHrHhDPlOScU="; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 2308a4b61647..2debdc6140d2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs ]; + nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs ]; configurePhase = '' runHook preConfigure @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { export HOME=$PWD/tmp mkdir -p $HOME - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $offlineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix deleted file mode 100644 index b6c9f61f821e..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, stdenv -, mkDerivation -, fetchFromGitHub -, libXScrnSaver -, olm -, pkg-config -, pyotherside -, python3Packages -, qmake -, qtbase -, qtgraphicaleffects -, qtkeychain -, qtmultimedia -, qtquickcontrols2 -, wrapQtAppsHook -}: - -mkDerivation rec { - pname = "mirage"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "mirukana"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-dJS4lAXHHNUEAG75gQaS9+aQTTTj8KHqHjISioynFdY="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - pkg-config - python3Packages.wrapPython - qmake - wrapQtAppsHook - ]; - - buildInputs = [ - libXScrnSaver - olm - pyotherside - qtbase - qtgraphicaleffects - qtkeychain - qtmultimedia - qtquickcontrols2 - ] ++ pythonPath; - - pythonPath = with python3Packages; [ - pillow - aiofiles - appdirs - cairosvg - filetype - html-sanitizer - lxml - mistune - pymediainfo - plyer - sortedcontainers - watchgod - redbaron - hsluv - simpleaudio - setuptools - watchgod - dbus-python - matrix-nio - ] ++ matrix-nio.optional-dependencies.e2e; - - qmakeFlags = [ - "PREFIX=${placeholder "out"}" - "CONFIG+=qtquickcompiler" - ]; - - dontWrapQtApps = true; - postInstall = '' - buildPythonPath "$out $pythonPath" - wrapProgram $out/bin/mirage \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - "''${qtWrapperArgs[@]}" - ''; - - meta = with lib; { - homepage = "https://github.com/mirukana/mirage"; - description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ colemickens AndersonTorres ]; - inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin || python3Packages.isPy37 || python3Packages.isPy38; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix deleted file mode 100644 index eb606f796cfb..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: - -stdenv.mkDerivation rec { - pname = "tox-prpl"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "jin-eld"; - repo = "tox-prpl"; - rev = "v${version}"; - sha256 = "0ms367l2f7x83k407c93bmhpyc820f1css61fh2gx4jq13cxqq3p"; - }; - - NIX_LDFLAGS = "-lssp -lsodium"; - - postInstall = "mv $out/lib/purple-2 $out/lib/pidgin"; - - buildInputs = [ libtoxcore pidgin libsodium ]; - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - broken = true; # unmaintained and not compatible with current Tox API. - homepage = "https://github.com/jin-eld/tox-prpl"; - description = "Tox plugin for Pidgin / libpurple"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index cf2c44f5f2f2..86bc2d671eb0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -9,7 +9,7 @@ , fetchYarnDeps , yarn , nodejs -, fixup_yarn_lock +, prefetch-yarn-deps , electron , Security , AppKit @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { sha256 = pinData.desktopYarnHash; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper copyDesktopItems ]; + nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper copyDesktopItems ]; inherit (element-desktop) seshat keytar; configurePhase = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) pushd element-desktop yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive rm -rf node_modules/matrix-seshat node_modules/keytar ln -s $keytar node_modules/keytar diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index 1cba6c62a765..0803bcc37791 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -3,7 +3,7 @@ , fetchYarnDeps , nodejs , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , writeText, jq, conf ? {} }: @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { sha256 = pinData.reactSdkYarnHash; }; - nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; + nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; configurePhase = '' runHook preConfigure @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME pushd element-web - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $webOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules @@ -64,14 +64,14 @@ in stdenv.mkDerivation rec { popd pushd matrix-js-sdk - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules popd pushd matrix-react-sdk - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules scripts diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 0e66707349db..683b1d7550cb 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.39.0"; - hash = "sha256-cG8ZFWpx92haTgMkpMMcFDV0OB7lmU540g9fNj4ofy8="; + version = "6.39.1"; + hash = "sha256-dDbUpxXpQg1SoVyYO33Nczqf+WmWDPNE6cmw792wjGY="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.40.0-beta.1"; - hash = "sha256-daXh1Uh2lHw0NA/j7qhQK7nrVljbr/fP2iLjcqnuvns="; + version = "6.40.0-beta.2"; + hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index aec46a8c0f6b..1d75bd542d6c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -179,6 +179,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ mic92 equirosa urandom ]; + mainProgram = pname; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 068e47e92615..2e1cae4fb2a3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.34.121"; - x86_64-darwin-sha256 = "0j04rj8v6aq4kjlkkc6yf466zq821jg3qy6qppmvyg5z0f08cyar"; + x86_64-darwin-version = "4.35.126"; + x86_64-darwin-sha256 = "1fmcvj4ryf9k82hbrkb4fl7iki6v80msgrwsc7l996wzkg5j771n"; - x86_64-linux-version = "4.34.121"; - x86_64-linux-sha256 = "11199dsp7phmz0bxlk5al61xp2g6yzgj17nwz0zrx1g7ak0qdvz5"; + x86_64-linux-version = "4.35.126"; + x86_64-linux-sha256 = "0axwmhr8r8q3ih91zxwj3z64fnjy7w4mzmlyxcp2iws5gd541lcm"; - aarch64-darwin-version = "4.34.121"; - aarch64-darwin-sha256 = "0pvlf9h8433fi31398g4rkii14gk77a684sln8n95xg5p3lxkydy"; + aarch64-darwin-version = "4.35.126"; + aarch64-darwin-sha256 = "0g477a31sdyxmg66aklpw359k1kk7vrd96vgcy5lxsvwvihiinkz"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh index 2981a26a8e3e..eacd7b4284c7 100755 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -33,7 +33,7 @@ sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\" sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix" -if ! nix-build -A slack "$nixpkgs"; then +if ! nix-build -A slack "$nixpkgs" --arg config '{ allowUnfree = true; }'; then echo "The updated slack failed to build." exit 1 fi diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index a30f5be4ce9f..ed8ed3032781 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -7,7 +7,7 @@ , yarn , nodejs , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , electron , libpulseaudio , pipewire @@ -19,28 +19,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.19"; + version = "1.3.22"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-+n26VTNRymPdzMbSz8AZsQ73xOHizOFAstw6toKfZQM="; + hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-SxUdTzk8WngkKwT05U8HJsK8+8ezcJWdiT/ettxpeEE="; + hash = "sha256-ydhJXAvz3k6GwpnSL6brl9xFpb+ooi8Am89TkcE00hc="; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; configurePhase = '' runHook preConfigure export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index e0d3a4171cac..d069e0a1f446 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,8 +1,6 @@ { lib , fetchFromGitHub -, fetchurl , fetchpatch -, fetchpatch2 , callPackage , pkg-config , cmake @@ -28,7 +26,6 @@ , libopus , alsa-lib , libpulseaudio -, perlPackages , pipewire , range-v3 , tl-expected @@ -57,9 +54,11 @@ , libpsl , brotli , microsoft-gsl -, mm-common , rlottie , stdenv +, darwin +, lld +, libicns , nix-update-script }: @@ -72,34 +71,12 @@ let tg_owt = callPackage ./tg_owt.nix { + inherit stdenv; abseil-cpp = abseil-cpp.override { cxxStandard = "20"; }; }; - glibmm = glibmm_2_68.overrideAttrs (attrs: { - version = "2.78.0"; - src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.78/glibmm-2.78.0.tar.xz"; - hash = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A="; - }; - patches = [ - # Revert "Glib, Gio: Add new API from glib 2.77.0" - (fetchpatch2 { - url = "https://github.com/GNOME/glibmm/commit/5b9032c0298cbb49c3ed90d5f71f2636751fa638.patch"; - revert = true; - hash = "sha256-UzrzIOnXh9pxuTDQsp6mnunDNNtc86hE9tCe1NgKsyo="; - }) - ]; - mesonFlags = [ - "-Dmaintainer-mode=true" - "-Dbuild-documentation=false" - ]; - nativeBuildInputs = attrs.nativeBuildInputs ++ [ - mm-common - perlPackages.perl - perlPackages.XMLParser - ]; - }); + mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram"; in stdenv.mkDerivation rec { pname = "telegram-desktop"; @@ -114,6 +91,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./macos.patch # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary # see https://github.com/NixOS/nixpkgs/issues/218370 @@ -123,7 +101,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ @@ -143,39 +121,45 @@ stdenv.mkDerivation rec { cmake ninja python3 + wrapQtAppsHook + ] ++ lib.optionals stdenv.isLinux [ gobject-introspection wrapGAppsHook - wrapQtAppsHook extra-cmake-modules + ] ++ lib.optionals stdenv.isDarwin [ + lld ]; buildInputs = [ qtbase - qtwayland qtsvg qtimageformats - gtk3 boost - fmt - libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus + range-v3 + tl-expected + rnnoise + protobuf + tg_owt + microsoft-gsl + rlottie + ] ++ lib.optionals stdenv.isLinux [ + qtwayland + gtk3 + fmt + libdbusmenu alsa-lib libpulseaudio pipewire - range-v3 - tl-expected hunspell - glibmm + glibmm_2_68 webkitgtk_6_0 jemalloc - rnnoise - protobuf - tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. pcre @@ -192,9 +176,44 @@ stdenv.mkDerivation rec { libsysprof-capture libpsl brotli - microsoft-gsl - rlottie - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + Cocoa + CoreFoundation + CoreServices + CoreText + CoreGraphics + CoreMedia + OpenGL + AudioUnit + ApplicationServices + Foundation + AGL + Security + SystemConfiguration + Carbon + AudioToolbox + VideoToolbox + VideoDecodeAcceleration + AVFoundation + CoreAudio + CoreVideo + CoreMediaIO + QuartzCore + AppKit + CoreWLAN + WebKit + IOKit + GSS + MediaPlayer + IOSurface + Metal + NaturalLanguage + libicns + ]); + + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; cmakeFlags = [ "-Ddisable_autoupdate=ON" @@ -210,13 +229,21 @@ stdenv.mkDerivation rec { export GI_GIR_PATH="$XDG_DATA_DIRS" ''; - postFixup = '' + installPhase = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r ${mainProgram}.app $out/Applications + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} + ''; + + postFixup = lib.optionalString stdenv.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/telegram-desktop \ + wrapProgram $out/bin/${mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + '' + lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; passthru = { @@ -231,10 +258,10 @@ stdenv.mkDerivation rec { the MTProto secure protocol. ''; license = licenses.gpl3Only; - platforms = platforms.linux; + platforms = platforms.all; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; - mainProgram = "telegram-desktop"; + inherit mainProgram; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch new file mode 100644 index 000000000000..c8424359fdbf --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch @@ -0,0 +1,69 @@ +diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +index ef544803e9..69c61b3139 100644 +--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { + [window setTitleVisibility:NSWindowTitleHidden]; + [window setTitlebarAppearsTransparent:YES]; + [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; ++#if 0 + if (@available(macOS 12.0, *)) { + _data->topNotchSkip = [[window screen] safeAreaInsets].top; + } ++#endif + } + + void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +index 7ce90d3..dac3c2c 100644 +--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; + + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; ++#if 0 + if (@available(macOS 12.0, *)) { + [center + addObserver: _observer +@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + name: NSProcessInfoPowerStateDidChangeNotification + object: nil]; + } ++#endif + [center + addObserver: _observer + selector: @selector(powerStateChanged:) +@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const { + return std::nullopt; + } + NSProcessInfo *info = [NSProcessInfo processInfo]; ++#if 0 + if (@available(macOS 12.0, *)) { + if ([info isLowPowerModeEnabled]) { + return true; + } + } ++#endif + const auto state = DetectBatteryState(); + if (!state.has || !state.draining) { + return false; +Submodule Telegram/lib_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 +--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm ++++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +@@ -254,10 +254,12 @@ void *Instance::winId() { + } + + void Instance::setOpaqueBg(QColor opaqueBg) { ++#if 0 + if (@available(macOS 12.0, *)) { + [_webview setValue: @NO forKey: @"drawsBackground"]; + [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; + } ++#endif + } + + void Instance::resizeToWindow() { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index c26bebc8a893..dddbfb799396 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -4,7 +4,7 @@ , openh264, usrsctp, libevent, libvpx , libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire -, mesa, libepoxy, libglvnd, unstableGitUpdater +, mesa, libepoxy, libglvnd, unstableGitUpdater, darwin }: stdenv.mkDerivation { @@ -24,12 +24,28 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg libopus ffmpeg alsa-lib libpulseaudio protobuf - openh264 usrsctp libevent libvpx + libjpeg libopus ffmpeg protobuf openh264 usrsctp libevent libvpx abseil-cpp + ] ++ lib.optionals stdenv.isLinux [ libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi - glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire + glib pcre util-linuxMinimal libselinux libsepol pipewire alsa-lib libpulseaudio mesa libepoxy libglvnd - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + AppKit + IOKit + IOSurface + Foundation + AVFoundation + CoreMedia + VideoToolbox + CoreGraphics + CoreVideo + OpenGL + Metal + MetalKit + CoreFoundation + ApplicationServices + ]); patches = [ # GCC 12 Fix diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 3dd912da90d7..dcf33a91f951 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "twinkle"; - version = "unstable-2021-02-06"; + version = "unstable-2023-03-25"; src = fetchFromGitHub { owner = "LubosD"; repo = "twinkle"; - rev = "2301b66a3f54b266675415d261985488d86e9e4c"; - sha256 = "xSwcaj1Hm62iL7C/AxqjVR07VEae8gDgYdr2EWmCoOM="; + rev = "355813d5640ad58c84dc063826069384470ce310"; + hash = "sha256-u+RewFwW17Oz2+lJLlmwebaGn4ebTBquox9Av7Jh1as="; }; buildInputs = [ @@ -56,6 +56,7 @@ mkDerivation rec { "-DWITH_G729=On" "-DWITH_SPEEX=On" "-DWITH_ILBC=On" + "-DHAVE_LIBATOMIC=atomic" /* "-DWITH_DIAMONDCARD=On" seems ancient and broken */ ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 21a8a4a96303..59966f01d892 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "wavebox"; - version = "10.118.5-2"; + version = "10.119.8-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz"; - sha256 = "sha256-TxMl8pdycCMY6NFi5MSLZg0p/+KmuAPQOm370bPMm/0="; + sha256 = "sha256-5xgDY/tLa1ZjlVH9ytcHa2ryw4GuvACevPfb9uFfvPE="; }; # don't remove runtime deps diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix index df995010198d..2a8a8bb93e72 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "v${version}"; - hash = "sha256-isrExJeONhIxJUXOsMMq8l9xF9amInBGnb5D+DKuzHw="; + hash = "sha256-0bSUfIqEkkjnwp+6zTg/KUpcQvOwUo5q7KnF8MLyIoo="; }; - npmDepsHash = "sha256-RTYPxS6uLLCIu4JfQqMQP8y8+S5uwe3KXWNlbe7/A7Q="; + npmDepsHash = "sha256-uO83IsNo/Efd+j5nVvwaao0u9hZUv0jDE8/x61QmYA4="; nativeBuildInputs = [ copyDesktopItems diff --git a/nixpkgs/pkgs/applications/networking/insync/default.nix b/nixpkgs/pkgs/applications/networking/insync/default.nix index 4e11d9fe3863..844b8648d6c8 100644 --- a/nixpkgs/pkgs/applications/networking/insync/default.nix +++ b/nixpkgs/pkgs/applications/networking/insync/default.nix @@ -37,6 +37,7 @@ let 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 { diff --git a/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix index 8a06565e1fce..416f3dc60cc6 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/INFURA/ipfs-upload-client"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "ipfs-upload-client"; }; } diff --git a/nixpkgs/pkgs/applications/networking/ipget/default.nix b/nixpkgs/pkgs/applications/networking/ipget/default.nix index c45398dfd4f4..0ad7de8ec468 100644 --- a/nixpkgs/pkgs/applications/networking/ipget/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipget/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://ipfs.io/"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; + mainProgram = "ipget"; }; } diff --git a/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix b/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix index c90fd239267e..d21f21def8e2 100644 --- a/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix +++ b/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ devhell ]; + mainProgram = "iptraf-ng"; }; } diff --git a/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index 186f1a74020b..da4967916d44 100644 --- a/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -4,13 +4,13 @@ perlPackages.buildPerlPackage rec { pname = "convos"; - version = "7.02"; + version = "8.05"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i8lDK5/Whi5uo2/Qqh5jgJGLuuHn7kdrfvr+9Ktzp/8="; + sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs="; }; nativeBuildInputs = [ makeWrapper ] @@ -20,9 +20,8 @@ perlPackages.buildPerlPackage rec { CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt FileHomeDir FileReadBackwards HTTPAcceptLanguage SyntaxKeywordTry FutureAsyncAwait IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall - Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog MojoliciousPluginWebpack - ParseIRC TextMarkdownHoedown TimePiece UnicodeUTF8 - CpanelJSONXS EV + Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog ParseIRC + TextMarkdownHoedown TimePiece UnicodeUTF8 CpanelJSONXS EV YAMLLibYAML ]; propagatedBuildInputs = [ openssl ]; @@ -48,6 +47,9 @@ perlPackages.buildPerlPackage rec { substituteInPlace t/web-register-open-to-public.t \ --replace '!127.0.0.1!' '!localhost!' + # Another online test fails, so remove this. + rm t/irc-reconnect.t + # A webirc test fails to resolve "localhost" likely due to sandboxing, we # remove this test. # @@ -74,9 +76,9 @@ perlPackages.buildPerlPackage rec { AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos mkdir -p $AUTO_SHARE_PATH cp -vR public assets $AUTO_SHARE_PATH/ - ln -s $AUTO_SHARE_PATH/public/asset $out/asset + ln -s $AUTO_SHARE_PATH/public/assets $out/assets cp -vR templates $out/templates - cp cpanfile $out/cpanfile + cp Makefile.PL $out/Makefile.PL '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/convos '' + '' diff --git a/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock b/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock index 5d545ee3d1f0..ccb478970631 100644 --- a/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock +++ b/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock @@ -146,6 +146,134 @@ dependencies = [ ] [[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", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.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", + "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.18", +] + +[[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.18", +] + +[[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" @@ -212,6 +340,15 @@ 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.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -231,6 +368,21 @@ dependencies = [ ] [[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + +[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -313,7 +465,7 @@ dependencies = [ "js-sys", "num-traits", "serde", - "time", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -413,6 +565,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" [[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" @@ -474,6 +635,15 @@ dependencies = [ ] [[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" @@ -532,6 +702,16 @@ 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 = "d3d12" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -568,6 +748,27 @@ dependencies = [ ] [[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "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" @@ -629,6 +830,27 @@ dependencies = [ ] [[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.18", +] + +[[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -679,6 +901,12 @@ dependencies = [ ] [[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" @@ -828,6 +1056,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] name = "futures-macro" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -869,6 +1112,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" @@ -1020,6 +1273,7 @@ dependencies = [ "iced", "image", "log", + "notify-rust", "once_cell", "open", "palette", @@ -1085,6 +1339,12 @@ 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" @@ -1523,6 +1783,19 @@ dependencies = [ ] [[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" @@ -1778,6 +2051,19 @@ dependencies = [ ] [[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" @@ -1982,6 +2268,16 @@ dependencies = [ ] [[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "ouroboros" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2038,6 +2334,12 @@ dependencies = [ ] [[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" @@ -2191,6 +2493,22 @@ dependencies = [ ] [[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2553,6 +2871,17 @@ dependencies = [ ] [[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.18", +] + +[[package]] name = "serde_spanned" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2574,6 +2903,27 @@ dependencies = [ ] [[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" @@ -2771,6 +3121,16 @@ dependencies = [ ] [[package]] +name = "tauri-winrt-notification" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +dependencies = [ + "quick-xml", + "windows 0.39.0", +] + +[[package]] name = "tempfile" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2835,6 +3195,22 @@ dependencies = [ ] [[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.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3008,10 +3384,22 @@ 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.18", +] + +[[package]] name = "tracing-core" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3038,6 +3426,22 @@ dependencies = [ ] [[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" @@ -3149,6 +3553,12 @@ dependencies = [ ] [[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3542,6 +3952,19 @@ dependencies = [ [[package]] name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" @@ -3635,6 +4058,12 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[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" @@ -3647,6 +4076,12 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[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" @@ -3659,6 +4094,12 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[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" @@ -3671,6 +4112,12 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[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" @@ -3695,6 +4142,12 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[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" @@ -3816,6 +4269,16 @@ dependencies = [ ] [[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 = "xml-rs" version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3837,6 +4300,72 @@ 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" @@ -3850,3 +4379,41 @@ 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/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix b/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix index eb54490c60b6..1c88cb3727fe 100644 --- a/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2023.4"; + version = "2023.5"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-j5Yw7rXdNd32RnbV2jQ+ZUjbm14AKZ7khQNX6A+qPAM="; + hash = "sha256-XGNFLfZDDGTT55UAsapUf1B0uSzrNjwSRK+yQSU3wG0="; }; cargoLock = { diff --git a/nixpkgs/pkgs/applications/networking/iroh/default.nix b/nixpkgs/pkgs/applications/networking/iroh/default.nix index a260bca6a55d..2e2ef6ee6ccc 100644 --- a/nixpkgs/pkgs/applications/networking/iroh/default.nix +++ b/nixpkgs/pkgs/applications/networking/iroh/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://iroh.computer"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ cameronfyfe ]; + mainProgram = "iroh"; }; } diff --git a/nixpkgs/pkgs/applications/networking/juju/default.nix b/nixpkgs/pkgs/applications/networking/juju/default.nix index d0542f5c3edc..17d80e496e31 100644 --- a/nixpkgs/pkgs/applications/networking/juju/default.nix +++ b/nixpkgs/pkgs/applications/networking/juju/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://juju.is"; license = licenses.mit; maintainers = with maintainers; [ citadelcore ]; + mainProgram = "juju"; }; } diff --git a/nixpkgs/pkgs/applications/networking/jxplorer/default.nix b/nixpkgs/pkgs/applications/networking/jxplorer/default.nix index 7f1a46b37dab..e64cbaf357b0 100644 --- a/nixpkgs/pkgs/applications/networking/jxplorer/default.nix +++ b/nixpkgs/pkgs/applications/networking/jxplorer/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = lib.licenses.caossl; maintainers = with maintainers; [ benwbooth ]; platforms = platforms.linux; + mainProgram = "jxplorer"; }; } diff --git a/nixpkgs/pkgs/applications/networking/lieer/default.nix b/nixpkgs/pkgs/applications/networking/lieer/default.nix index 26ecf043a4d5..7ce2d07ce7dd 100644 --- a/nixpkgs/pkgs/applications/networking/lieer/default.nix +++ b/nixpkgs/pkgs/applications/networking/lieer/default.nix @@ -42,5 +42,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://lieer.gaute.vetsj.com/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli ]; + mainProgram = "gmi"; }; } diff --git a/nixpkgs/pkgs/applications/networking/linssid/default.nix b/nixpkgs/pkgs/applications/networking/linssid/default.nix index 72128a5ef95c..000354d1e5c9 100644 --- a/nixpkgs/pkgs/applications/networking/linssid/default.nix +++ b/nixpkgs/pkgs/applications/networking/linssid/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "linssid"; }; } diff --git a/nixpkgs/pkgs/applications/networking/listadmin/default.nix b/nixpkgs/pkgs/applications/networking/listadmin/default.nix index a59f65995e2e..6a4a2927d3ef 100644 --- a/nixpkgs/pkgs/applications/networking/listadmin/default.nix +++ b/nixpkgs/pkgs/applications/networking/listadmin/default.nix @@ -44,5 +44,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ nomeata ]; + mainProgram = "listadmin"; }; } diff --git a/nixpkgs/pkgs/applications/networking/lls/default.nix b/nixpkgs/pkgs/applications/networking/lls/default.nix index 5c882c1da80e..3d4d70597e69 100644 --- a/nixpkgs/pkgs/applications/networking/lls/default.nix +++ b/nixpkgs/pkgs/applications/networking/lls/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { maintainers = [ maintainers.k900 ]; platforms = platforms.linux; homepage = "https://github.com/jcaesar/lls"; + mainProgram = "lls"; }; } diff --git a/nixpkgs/pkgs/applications/networking/localproxy/default.nix b/nixpkgs/pkgs/applications/networking/localproxy/default.nix index 719b730817b4..9144b67c9abb 100644 --- a/nixpkgs/pkgs/applications/networking/localproxy/default.nix +++ b/nixpkgs/pkgs/applications/networking/localproxy/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ spalf ]; platforms = platforms.unix; + mainProgram = "localproxy"; }; }) diff --git a/nixpkgs/pkgs/applications/networking/localsend/default.nix b/nixpkgs/pkgs/applications/networking/localsend/default.nix index 87e0eb25dd40..47876e83d44d 100644 --- a/nixpkgs/pkgs/applications/networking/localsend/default.nix +++ b/nixpkgs/pkgs/applications/networking/localsend/default.nix @@ -1,49 +1,69 @@ -{ lib, stdenv, appimageTools, fetchurl, undmg }: +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, flutter +, makeDesktopItem +, pkg-config +, libayatana-appindicator +, undmg +}: let pname = "localsend"; - version = "1.11.1"; + version = "1.12.0"; - hashes = { - x86_64-linux = "sha256-K4M9cks0FNsCLIqQhSgUAz3tRMKng6JkZ/ZfwG2hZJA="; - x86_64-darwin = "sha256-Cixo00I4BBAmUnszsz+CxPX3EY175UTufCmwQmIsEgg="; - }; + linux = flutter.buildFlutterApplication { + inherit pname version; - srcs = rec { - x86_64-linux = fetchurl { - url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}-linux-x86-64.AppImage"; - hash = hashes.x86_64-linux; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = hashes.x86_64-darwin; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-mk0CLZP0x/mEixeAig7X41aFgQzs+kZkBJx6T//3ZKY="; }; - aarch64-darwin = x86_64-darwin; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system for package localsend: ${stdenv.hostPlatform.system}"); - appimageContents = appimageTools.extract { inherit pname version src; }; + sourceRoot = "source/app"; + depsListFile = ./deps.json; + vendorHash = "sha256-fXzxT7KBi/WT2A5PEIx+B+UG4HWEbMPMsashVQsXdmU="; - linux = appimageTools.wrapType2 rec { - inherit pname version src meta; + nativeBuildInputs = [ pkg-config ]; - extraPkgs = p: [ p.ayatana-ido p.libayatana-appindicator p.libayatana-indicator p.libdbusmenu p.libepoxy ]; + buildInputs = [ libayatana-appindicator ]; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} + postInstall = '' + for s in 32 128 256 512; do + d=$out/share/icons/hicolor/''${s}x''${s}/apps + mkdir -p $d + ln -s $out/app/data/flutter_assets/assets/img/logo-''${s}.png $d/localsend.png + done + mkdir -p $out/share/applications + cp $desktopItem/share/applications/*.desktop $out/share/applications + substituteInPlace $out/share/applications/*.desktop --subst-var out + ''; - install -m 444 -D ${appimageContents}/org.localsend.localsend_app.desktop \ - $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=localsend_app' "Exec=$out/bin/localsend" + desktopItem = makeDesktopItem { + name = "LocalSend"; + exec = "@out@/bin/localsend_app"; + icon = "localsend"; + desktopName = "LocalSend"; + startupWMClass = "localsend"; + genericName = "An open source cross-platform alternative to AirDrop"; + categories = [ "Network" ]; + }; - install -m 444 -D ${appimageContents}/localsend.png \ - $out/share/icons/hicolor/256x256/apps/localsend.png - ''; + meta = meta // { + mainProgram = "localsend_app"; + }; }; darwin = stdenv.mkDerivation { - inherit pname version src meta; + inherit pname version; + + src = fetchurl { + url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; + hash = "sha256-XKYc3lA7x0Tf1Mf3o7D2RYwYDRDVHoSb/lj9PhKzV5U="; + }; nativeBuildInputs = [ undmg ]; @@ -53,15 +73,19 @@ let mkdir -p $out/Applications cp -r *.app $out/Applications ''; + + meta = meta // { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + }; }; meta = with lib; { description = "An open source cross-platform alternative to AirDrop"; homepage = "https://localsend.org/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; + mainProgram = "localsend"; maintainers = with maintainers; [ sikmir ]; - platforms = builtins.attrNames srcs; }; in if stdenv.isDarwin diff --git a/nixpkgs/pkgs/applications/networking/localsend/deps.json b/nixpkgs/pkgs/applications/networking/localsend/deps.json new file mode 100644 index 000000000000..e8fc930b1ddc --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/localsend/deps.json @@ -0,0 +1,2498 @@ +[ + { + "name": "localsend_app", + "version": "1.12.0+38", + "kind": "root", + "source": "root", + "dependencies": [ + "basic_utils", + "collection", + "common", + "connectivity_plus", + "dart_mappable", + "desktop_drop", + "device_apps", + "device_info_plus", + "dio", + "dynamic_color", + "file_picker", + "file_selector", + "flutter", + "flutter_displaymode", + "flutter_localizations", + "flutter_markdown", + "gal", + "image_picker", + "intl", + "launch_at_startup", + "logging", + "mime", + "network_info_plus", + "open_filex", + "package_info_plus", + "pasteboard", + "path", + "path_provider", + "permission_handler", + "pretty_qr_code", + "refena_flutter", + "refena_inspector_client", + "routerino", + "screen_retriever", + "share_handler", + "shared_preferences", + "shared_storage", + "shelf", + "shelf_router", + "slang", + "slang_flutter", + "system_settings", + "system_tray", + "tray_manager", + "url_launcher", + "uuid", + "wakelock_plus", + "wechat_assets_picker", + "window_manager", + "build_runner", + "dart_mappable_builder", + "flutter_gen_runner", + "flutter_lints", + "msix", + "refena_inspector", + "slang_build_runner", + "slang_gpt", + "test", + "permission_handler_windows" + ] + }, + { + "name": "permission_handler_windows", + "version": "0.1.2", + "kind": "transitive", + "source": "git", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_platform_interface", + "version": "3.12.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math", + "web", + "sky_engine" + ] + }, + { + "name": "sky_engine", + "version": "0.0.99", + "kind": "transitive", + "source": "sdk", + "dependencies": [] + }, + { + "name": "web", + "version": "0.1.4-beta", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "vector_math", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "material_color_utilities", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "collection", + "version": "1.17.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "characters", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "test", + "version": "1.24.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "boolean_selector", + "collection", + "coverage", + "http_multi_server", + "io", + "js", + "node_preamble", + "package_config", + "path", + "pool", + "shelf", + "shelf_packages_handler", + "shelf_static", + "shelf_web_socket", + "source_span", + "stack_trace", + "stream_channel", + "typed_data", + "web_socket_channel", + "webkit_inspection_protocol", + "yaml", + "test_api", + "test_core", + "matcher" + ] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "test_core", + "version": "0.5.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "args", + "boolean_selector", + "collection", + "coverage", + "frontend_server_client", + "glob", + "io", + "meta", + "package_config", + "path", + "pool", + "source_map_stack_trace", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "vm_service", + "yaml", + "test_api" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "vm_service", + "version": "11.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "source_maps", + "version": "0.10.12", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_map_stack_trace", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "source_maps", + "stack_trace" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "6.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "coverage", + "version": "1.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "logging", + "package_config", + "path", + "source_maps", + "stack_trace", + "vm_service" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "5.13.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "61.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "webkit_inspection_protocol", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "logging" + ] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_packages_handler", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "shelf", + "shelf_static" + ] + }, + { + "name": "node_preamble", + "version": "2.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "slang_gpt", + "version": "0.10.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "collection", + "http", + "slang" + ] + }, + { + "name": "slang", + "version": "3.25.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "csv", + "yaml", + "json2yaml", + "watcher" + ] + }, + { + "name": "json2yaml", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "csv", + "version": "5.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "http", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "slang_build_runner", + "version": "3.25.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "build", + "glob", + "slang" + ] + }, + { + "name": "build", + "version": "2.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "convert", + "crypto", + "glob", + "logging", + "meta", + "package_config", + "path" + ] + }, + { + "name": "refena_inspector", + "version": "0.8.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "flutter", + "logging", + "path", + "refena", + "refena_flutter", + "refena_inspector_client", + "shelf", + "shelf_web_socket", + "web_socket_channel" + ] + }, + { + "name": "refena_inspector_client", + "version": "0.8.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta", + "refena", + "web_socket_channel" + ] + }, + { + "name": "refena", + "version": "0.37.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "refena_flutter", + "version": "0.37.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "refena" + ] + }, + { + "name": "msix", + "version": "3.16.4", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "yaml", + "path", + "package_config", + "get_it", + "image", + "pub_semver", + "console", + "cli_util" + ] + }, + { + "name": "cli_util", + "version": "0.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "console", + "version": "4.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math" + ] + }, + { + "name": "image", + "version": "4.0.17", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "meta", + "xml" + ] + }, + { + "name": "xml", + "version": "6.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "archive", + "version": "3.3.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "path", + "pointycastle" + ] + }, + { + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "get_it", + "version": "7.6.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection" + ] + }, + { + "name": "flutter_lints", + "version": "2.0.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_gen_runner", + "version": "5.3.2", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "flutter_gen_core", + "build", + "collection", + "crypto", + "glob", + "path" + ] + }, + { + "name": "flutter_gen_core", + "version": "5.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "yaml", + "mime", + "xml", + "dartx", + "color", + "collection", + "json_annotation", + "glob", + "dart_style", + "args", + "pub_semver" + ] + }, + { + "name": "dart_style", + "version": "2.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "json_annotation", + "version": "4.8.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "color", + "version": "3.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "dartx", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "characters", + "collection", + "crypto", + "meta", + "path", + "time" + ] + }, + { + "name": "time", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock" + ] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "dart_mappable_builder", + "version": "3.3.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "ansicolor", + "build", + "collection", + "dart_mappable", + "dart_style", + "glob", + "path", + "source_gen" + ] + }, + { + "name": "source_gen", + "version": "1.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "dart_style", + "glob", + "path", + "source_span", + "yaml" + ] + }, + { + "name": "dart_mappable", + "version": "3.3.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "type_plus" + ] + }, + { + "name": "type_plus", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "ansicolor", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "build_runner", + "version": "2.4.6", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "async", + "build", + "build_config", + "build_daemon", + "build_resolvers", + "build_runner_core", + "code_builder", + "collection", + "crypto", + "dart_style", + "frontend_server_client", + "glob", + "graphs", + "http_multi_server", + "io", + "js", + "logging", + "meta", + "mime", + "package_config", + "path", + "pool", + "pub_semver", + "pubspec_parse", + "shelf", + "shelf_web_socket", + "stack_trace", + "stream_transform", + "timing", + "watcher", + "web_socket_channel", + "yaml" + ] + }, + { + "name": "timing", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation" + ] + }, + { + "name": "stream_transform", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "pubspec_parse", + "version": "1.2.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, + { + "name": "graphs", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "code_builder", + "version": "4.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "collection", + "matcher", + "meta" + ] + }, + { + "name": "built_value", + "version": "8.6.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "built_collection", + "version": "5.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "build_runner_core", + "version": "7.2.10", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "build", + "build_config", + "build_resolvers", + "collection", + "convert", + "crypto", + "glob", + "graphs", + "json_annotation", + "logging", + "meta", + "package_config", + "path", + "pool", + "timing", + "watcher", + "yaml" + ] + }, + { + "name": "build_resolvers", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "collection", + "convert", + "crypto", + "graphs", + "logging", + "package_config", + "path", + "pool", + "pub_semver", + "stream_transform", + "yaml" + ] + }, + { + "name": "build_config", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "json_annotation", + "path", + "pubspec_parse", + "yaml" + ] + }, + { + "name": "build_daemon", + "version": "4.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "http_multi_server", + "logging", + "path", + "pool", + "shelf", + "shelf_web_socket", + "stream_transform", + "watcher", + "web_socket_channel" + ] + }, + { + "name": "window_manager", + "version": "0.3.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path", + "screen_retriever" + ] + }, + { + "name": "screen_retriever", + "version": "0.1.9", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "wechat_assets_picker", + "version": "8.7.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "extended_image", + "photo_manager", + "provider", + "video_player" + ] + }, + { + "name": "video_player", + "version": "2.7.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "html", + "video_player_android", + "video_player_avfoundation", + "video_player_platform_interface", + "video_player_web" + ] + }, + { + "name": "video_player_web", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_platform_interface", + "version": "6.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math", + "web" + ] + }, + { + "name": "video_player_avfoundation", + "version": "2.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_android", + "version": "2.4.10", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "html", + "version": "0.15.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "csslib", + "source_span" + ] + }, + { + "name": "csslib", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "provider", + "version": "6.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "nested" + ] + }, + { + "name": "nested", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "photo_manager", + "version": "2.7.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "extended_image", + "version": "8.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "extended_image_library", + "flutter", + "meta" + ] + }, + { + "name": "extended_image_library", + "version": "3.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "flutter", + "http_client_helper", + "js", + "path", + "path_provider" + ] + }, + { + "name": "path_provider", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, + { + "name": "path_provider_windows", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "win32", + "version": "5.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "ffi", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path_provider_platform_interface", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "platform", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path_provider_linux", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "1.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "http_client_helper", + "version": "3.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "http" + ] + }, + { + "name": "wakelock_plus", + "version": "1.1.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "meta", + "wakelock_plus_platform_interface", + "win32", + "dbus", + "package_info_plus", + "js" + ] + }, + { + "name": "package_info_plus", + "version": "4.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "flutter_web_plugins", + "http", + "meta", + "path", + "package_info_plus_platform_interface", + "win32" + ] + }, + { + "name": "package_info_plus_platform_interface", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "dbus", + "version": "0.7.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "ffi", + "meta", + "xml" + ] + }, + { + "name": "wakelock_plus_platform_interface", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "meta" + ] + }, + { + "name": "uuid", + "version": "3.0.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { + "name": "url_launcher", + "version": "6.1.14", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.20", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_macos", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_linux", + "version": "3.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_ios", + "version": "6.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_android", + "version": "6.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "tray_manager", + "version": "0.2.0", + "kind": "direct", + "source": "git", + "dependencies": [ + "flutter", + "menu_base", + "path", + "shortid" + ] + }, + { + "name": "shortid", + "version": "0.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "menu_base", + "version": "0.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "system_tray", + "version": "2.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path", + "uuid" + ] + }, + { + "name": "system_settings", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "slang_flutter", + "version": "3.25.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "slang" + ] + }, + { + "name": "shelf_router", + "version": "1.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http_methods", + "meta", + "shelf" + ] + }, + { + "name": "http_methods", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shared_storage", + "version": "0.8.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "shared_preferences", + "version": "2.2.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_android", + "shared_preferences_foundation", + "shared_preferences_linux", + "shared_preferences_platform_interface", + "shared_preferences_web", + "shared_preferences_windows" + ] + }, + { + "name": "shared_preferences_windows", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_platform_interface", + "path_provider_windows", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_platform_interface", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "shared_preferences_web", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_linux", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_linux", + "path_provider_platform_interface", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_foundation", + "version": "2.3.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_android", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "share_handler", + "version": "0.0.19", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "share_handler_android", + "share_handler_ios", + "share_handler_platform_interface" + ] + }, + { + "name": "share_handler_platform_interface", + "version": "0.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "share_handler_ios", + "version": "0.0.12", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "share_handler_platform_interface" + ] + }, + { + "name": "share_handler_android", + "version": "0.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "share_handler_platform_interface" + ] + }, + { + "name": "routerino", + "version": "0.8.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "pretty_qr_code", + "version": "2.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "qr" + ] + }, + { + "name": "qr", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "permission_handler", + "version": "11.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "permission_handler_android", + "permission_handler_apple", + "permission_handler_windows", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_apple", + "version": "9.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_android", + "version": "11.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "pasteboard", + "version": "0.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "js" + ] + }, + { + "name": "open_filex", + "version": "4.3.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "ffi" + ] + }, + { + "name": "network_info_plus", + "version": "4.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "nm", + "flutter", + "flutter_web_plugins", + "meta", + "network_info_plus_platform_interface", + "win32", + "ffi" + ] + }, + { + "name": "network_info_plus_platform_interface", + "version": "1.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "nm", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "dbus" + ] + }, + { + "name": "launch_at_startup", + "version": "0.2.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "win32_registry" + ] + }, + { + "name": "win32_registry", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "win32" + ] + }, + { + "name": "intl", + "version": "0.18.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "meta", + "path" + ] + }, + { + "name": "image_picker", + "version": "1.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "image_picker_android", + "image_picker_for_web", + "image_picker_ios", + "image_picker_linux", + "image_picker_macos", + "image_picker_platform_interface", + "image_picker_windows" + ] + }, + { + "name": "image_picker_windows", + "version": "0.2.1+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_platform_interface", + "file_selector_windows", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "image_picker_platform_interface", + "version": "2.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "flutter", + "http", + "plugin_platform_interface" + ] + }, + { + "name": "cross_file", + "version": "0.3.3+5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "js", + "meta" + ] + }, + { + "name": "file_selector_windows", + "version": "0.9.3+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "file_selector_platform_interface", + "version": "2.6.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "flutter", + "http", + "plugin_platform_interface" + ] + }, + { + "name": "image_picker_macos", + "version": "0.2.1+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_macos", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_macos", + "version": "0.9.3+2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "image_picker_linux", + "version": "0.2.1+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_linux", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_linux", + "version": "0.9.2+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "image_picker_ios", + "version": "0.8.8+2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "image_picker_for_web", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "image_picker_platform_interface", + "mime" + ] + }, + { + "name": "image_picker_android", + "version": "0.8.7+5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_plugin_android_lifecycle", + "image_picker_platform_interface" + ] + }, + { + "name": "flutter_plugin_android_lifecycle", + "version": "2.0.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "gal", + "version": "2.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_markdown", + "version": "0.6.18", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "markdown", + "meta", + "path" + ] + }, + { + "name": "markdown", + "version": "7.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "flutter_localizations", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "flutter", + "intl", + "characters", + "clock", + "collection", + "material_color_utilities", + "meta", + "path", + "vector_math", + "web" + ] + }, + { + "name": "flutter_displaymode", + "version": "0.6.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "file_selector", + "version": "1.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "file_selector_android", + "file_selector_ios", + "file_selector_linux", + "file_selector_macos", + "file_selector_platform_interface", + "file_selector_web", + "file_selector_windows", + "flutter" + ] + }, + { + "name": "file_selector_web", + "version": "0.9.2+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_platform_interface", + "flutter", + "flutter_web_plugins" + ] + }, + { + "name": "file_selector_ios", + "version": "0.5.1+6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "file_selector_android", + "version": "0.5.0+3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_platform_interface", + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "file_picker", + "version": "5.5.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "flutter_plugin_android_lifecycle", + "plugin_platform_interface", + "ffi", + "path", + "win32" + ] + }, + { + "name": "dynamic_color", + "version": "1.6.8", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_test", + "material_color_utilities" + ] + }, + { + "name": "flutter_test", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "test_api", + "matcher", + "path", + "fake_async", + "clock", + "stack_trace", + "vector_math", + "async", + "boolean_selector", + "characters", + "collection", + "material_color_utilities", + "meta", + "source_span", + "stream_channel", + "string_scanner", + "term_glyph", + "web" + ] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "dio", + "version": "5.3.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta", + "path" + ] + }, + { + "name": "device_info_plus", + "version": "9.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "device_info_plus_platform_interface", + "ffi", + "file", + "flutter", + "flutter_web_plugins", + "meta", + "win32", + "win32_registry" + ] + }, + { + "name": "device_info_plus_platform_interface", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "device_apps", + "version": "2.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "desktop_drop", + "version": "0.4.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "cross_file" + ] + }, + { + "name": "connectivity_plus", + "version": "4.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "connectivity_plus_platform_interface", + "js", + "meta", + "nm" + ] + }, + { + "name": "connectivity_plus_platform_interface", + "version": "1.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "common", + "version": "1.0.0", + "kind": "direct", + "source": "path", + "dependencies": [] + }, + { + "name": "basic_utils", + "version": "5.6.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "logging", + "json_annotation", + "pointycastle" + ] + } +] diff --git a/nixpkgs/pkgs/applications/networking/localsend/update.sh b/nixpkgs/pkgs/applications/networking/localsend/update.sh index 55c391c6fb5f..e142c7e37955 100755 --- a/nixpkgs/pkgs/applications/networking/localsend/update.sh +++ b/nixpkgs/pkgs/applications/networking/localsend/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl gnused +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq set -eou pipefail @@ -16,10 +16,6 @@ fi sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/default.nix" -LINUX_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}-linux-x86-64.AppImage" -LINUX_X64_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url ${LINUX_x64_URL})) -sed -i "0,/x86_64-linux/{s|x86_64-linux = \".*\"|x86_64-linux = \"${LINUX_X64_SHA}\"|}" "$ROOT/default.nix" - DARWIN_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}.dmg" DARWIN_X64_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url ${DARWIN_x64_URL})) -sed -i "0,/x86_64-darwin/{s|x86_64-darwin = \".*\"|x86_64-darwin = \"${DARWIN_X64_SHA}\"|}" "$ROOT/default.nix" +sed -i "/darwin/,/hash/{s|hash = \".*\"|hash = \"${DARWIN_X64_SHA}\"|}" "$ROOT/default.nix" diff --git a/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix index 6ce0abb6c0e6..51fde794a1c8 100644 --- a/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix +++ b/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -1,8 +1,11 @@ { lib , fetchFromGitHub , python3 -, qt6 +, qtbase +, qtsvg +, qtwayland , nixosTests +, wrapQtAppsHook }: python3.pkgs.buildPythonApplication rec { @@ -28,12 +31,13 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - qt6.qtbase - qt6.qtsvg # Needed for the systray icon + qtwayland + qtbase + qtsvg # Needed for the systray icon ]; nativeBuildInputs = [ - qt6.wrapQtAppsHook + wrapQtAppsHook ]; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix index a9becb9d8c90..bcd9573974d3 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchPypi, pkgs }: +{ lib, python3Packages, fetchPypi, pkgs, testers, afew }: python3Packages.buildPythonApplication rec { pname = "afew"; @@ -25,6 +25,7 @@ python3Packages.buildPythonApplication rec { chardet dkimpy notmuch + setuptools ]; nativeCheckInputs = [ @@ -44,6 +45,12 @@ python3Packages.buildPythonApplication rec { "man" ]; + passthru.tests = { + version = testers.testVersion { + package = afew; + }; + }; + meta = with lib; { homepage = "https://github.com/afewmail/afew"; description = "An initial tagging script for notmuch mail"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 2ae02236fe07..51f6eeacd1be 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,7 +31,7 @@ , enablePluginBsfilter ? true , enablePluginClamd ? true , enablePluginDillo ? true -, enablePluginFancy ? true, libsoup, webkitgtk +, enablePluginFancy ? true, webkitgtk , enablePluginFetchInfo ? true , enablePluginKeywordWarner ? true , enablePluginLibravatar ? enablePluginRavatar @@ -67,7 +67,7 @@ let { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } - { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ libsoup webkitgtk ]; } + { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } @@ -96,11 +96,11 @@ let ]; in stdenv.mkDerivation rec { pname = "claws-mail"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { url = "https://claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - hash = "sha256-sYnnAMGJb14N6wt21L+oIOt6wZNe4Qqpr7raPPU6A0Q="; + hash = "sha256-fIqxcy10GX3wbWGmt+vHxYDs9ukuse9q5bAQdTPxrwc="; }; outputs = [ "out" "dev" ]; @@ -136,8 +136,6 @@ in stdenv.mkDerivation rec { "--disable-manual" # Missing docbook-tools, e.g., docbook2html "--disable-compface" # Missing compface library "--disable-jpilot" # Missing jpilot library - - "--disable-gdata-plugin" # Complains about missing libgdata, even when provided ] ++ (map (feature: map (flag: lib.strings.enableFeature feature.enabled flag) feature.flags) features); diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index ca565423530a..b7948a9df97d 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.48.2"; + version = "3.50.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "UE2YAPW6vMXBcO9QxUZOTrwSAOQZAs2mn+j6v/L7cMA="; + sha256 = "577S3Z/AhFf3W6ufiWJV8w/TTHu8nIqV74fi4pEqCa0="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch index dae88b9e2bae..aa1b1bcb89db 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -1,8 +1,33 @@ +diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c +index 653a8fb..ad80283 100644 +--- a/src/EWS/calendar/e-cal-backend-ews-utils.c ++++ b/src/EWS/calendar/e-cal-backend-ews-utils.c +@@ -2406,7 +2406,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) + if (schema) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution.calendar"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, ++ NULL); ++ } + + if (g_settings_get_boolean (settings, "use-system-timezone")) + location = e_cal_util_get_system_timezone_location (); diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c -index 0707f72..1e71954 100644 +index dbd9adb..a2372a4 100644 --- a/src/EWS/camel/camel-ews-utils.c +++ b/src/EWS/camel/camel-ews-utils.c -@@ -1552,7 +1552,18 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C +@@ -1553,7 +1553,18 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C evo_labels = g_ptr_array_new_full (5, g_free); @@ -47,7 +72,7 @@ index 6deda60..9b44cc7 100644 if (location) { zone = i_cal_timezone_get_builtin_timezone (location); diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c -index ff1b8e3..4f876c0 100644 +index 3db3564..a233d4d 100644 --- a/src/Microsoft365/camel/camel-m365-store.c +++ b/src/Microsoft365/camel/camel-m365-store.c @@ -309,7 +309,18 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index fd0e436ec45c..896c2a6c269c 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.48.4"; + version = "3.50.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "oC+Z66BQp3HyxH1D/FLgCyJg/IbQYyD79S68fozni7c="; + sha256 = "5CA240m4Mrkbprxg+Zxkte0AjrDrM7wipU8p9I7r1Zg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 8d0bc45c4a02..fccca24f9d28 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { description = "A small but very powerful text-based mail client"; homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ erikryb jfrankenau vrthra ma27 raitobezarius ]; + maintainers = with maintainers; [ erikryb vrthra ma27 raitobezarius ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 87ad4a015fd8..7046c701914d 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.38"; + version = "0.38.1"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "sha256-oXkBrb5D9IGmv1PBWiogJovI3HrVzPaFoNF8FFbbr24="; + hash = "sha256-wUGHYNDlPvrR81Jn65mlD4t/ooVcFHPgpMmCuG+OzdQ="; }; nativeBuildInputs = [ @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { updateScript = gitUpdater { url = "https://git.notmuchmail.org/git/notmuch"; - ignoredVersions = "_rc.*"; + ignoredVersions = "_(rc|pre).*"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/mhost/default.nix b/nixpkgs/pkgs/applications/networking/mhost/default.nix index beed066e65e9..ac02ca8f64c1 100644 --- a/nixpkgs/pkgs/applications/networking/mhost/default.nix +++ b/nixpkgs/pkgs/applications/networking/mhost/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lukaspustina/mhost"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mgttlinger ]; + mainProgram = "mhost"; }; } diff --git a/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix b/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix index 5702ff414f33..21748a86e81b 100644 --- a/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ ahuzik galagora ]; platforms = platforms.linux; + mainProgram = "modem-manager-gui"; }; } diff --git a/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/nixpkgs/pkgs/applications/networking/msmtp/default.nix index 479d0980919c..174fa5e9d9f5 100644 --- a/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -19,6 +19,7 @@ , libsecret , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd +, withScripts ? true }: let @@ -124,9 +125,11 @@ let }; in -symlinkJoin { - name = "msmtp-${version}"; - inherit version meta; - paths = [ binaries scripts ]; - passthru = { inherit binaries scripts; }; -} +if withScripts then + symlinkJoin + { + name = "msmtp-${version}"; + inherit version meta; + paths = [ binaries scripts ]; + passthru = { inherit binaries scripts; }; + } else binaries diff --git a/nixpkgs/pkgs/applications/networking/n8n/default.nix b/nixpkgs/pkgs/applications/networking/n8n/default.nix index 1b2caaf5bb06..20775c4ed4af 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/default.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/default.nix @@ -41,5 +41,6 @@ nodePackages.n8n.override { description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services."; maintainers = with maintainers; [ freezeboy k900 ]; license = licenses.sustainableUse; + mainProgram = "n8n"; }; } diff --git a/nixpkgs/pkgs/applications/networking/nali/default.nix b/nixpkgs/pkgs/applications/networking/nali/default.nix index 8fc822416bf2..80087822bf85 100644 --- a/nixpkgs/pkgs/applications/networking/nali/default.nix +++ b/nixpkgs/pkgs/applications/networking/nali/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/zu1k/nali"; license = licenses.mit; maintainers = with maintainers; [ diffumist xyenon ]; + mainProgram = "nali"; }; } diff --git a/nixpkgs/pkgs/applications/networking/ncgopher/default.nix b/nixpkgs/pkgs/applications/networking/ncgopher/default.nix index bebb16740840..5bc7da276caf 100644 --- a/nixpkgs/pkgs/applications/networking/ncgopher/default.nix +++ b/nixpkgs/pkgs/applications/networking/ncgopher/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.bsd2; maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; + mainProgram = "ncgopher"; }; } diff --git a/nixpkgs/pkgs/applications/networking/ndppd/default.nix b/nixpkgs/pkgs/applications/networking/ndppd/default.nix index 290a6519f85a..b52f312e03fe 100644 --- a/nixpkgs/pkgs/applications/networking/ndppd/default.nix +++ b/nixpkgs/pkgs/applications/networking/ndppd/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fadenb ]; + mainProgram = "ndppd"; }; } diff --git a/nixpkgs/pkgs/applications/networking/netmaker/default.nix b/nixpkgs/pkgs/applications/networking/netmaker/default.nix index 5b493e5460b7..086c9325f565 100644 --- a/nixpkgs/pkgs/applications/networking/netmaker/default.nix +++ b/nixpkgs/pkgs/applications/networking/netmaker/default.nix @@ -38,7 +38,8 @@ buildGoModule rec { description = "WireGuard automation from homelab to enterprise"; homepage = "https://netmaker.io"; changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}"; - license = licenses.sspl; + license = licenses.asl20; maintainers = with maintainers; [ urandom qjoly ]; + mainProgram = "netmaker"; }; } diff --git a/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/nixpkgs/pkgs/applications/networking/nextdns/default.nix index 91d4c8dccbac..094fa8007d7b 100644 --- a/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://nextdns.io"; license = licenses.mit; maintainers = with maintainers; [ pnelson ]; + mainProgram = "nextdns"; }; } diff --git a/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix index a3a136a32695..05c8263f436b 100644 --- a/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix +++ b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.fadenb ]; platforms = lib.platforms.all; + mainProgram = "nntp-proxy"; }; } diff --git a/nixpkgs/pkgs/applications/networking/novnc/default.nix b/nixpkgs/pkgs/applications/networking/novnc/default.nix index 17d32b84a78f..c0fa9afdb243 100644 --- a/nixpkgs/pkgs/applications/networking/novnc/default.nix +++ b/nixpkgs/pkgs/applications/networking/novnc/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://novnc.com"; license = with licenses; [ mpl20 ofl bsd3 bsd2 mit ]; maintainers = with maintainers; [ neverbehave ]; + mainProgram = "novnc"; }; } diff --git a/nixpkgs/pkgs/applications/networking/offrss/default.nix b/nixpkgs/pkgs/applications/networking/offrss/default.nix index 773ec444edf9..8d7889663fff 100644 --- a/nixpkgs/pkgs/applications/networking/offrss/default.nix +++ b/nixpkgs/pkgs/applications/networking/offrss/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ viric ]; platforms = lib.platforms.linux; + mainProgram = "offrss"; }; } diff --git a/nixpkgs/pkgs/applications/networking/omping/default.nix b/nixpkgs/pkgs/applications/networking/omping/default.nix index 2089408d09ba..808df455a4f2 100644 --- a/nixpkgs/pkgs/applications/networking/omping/default.nix +++ b/nixpkgs/pkgs/applications/networking/omping/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; inherit (src.meta) homepage; + mainProgram = "omping"; }; } diff --git a/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/nixpkgs/pkgs/applications/networking/onionshare/default.nix index d1aef5180837..6cb15ad685d9 100644 --- a/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -58,6 +58,7 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ lourkeur ]; + mainProgram = "onionshare-cli"; }; # TODO: package meek https://support.torproject.org/glossary/meek/ diff --git a/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/nixpkgs/pkgs/applications/networking/opsdroid/default.nix index d4f2a9b26a18..45569fefb28f 100644 --- a/nixpkgs/pkgs/applications/networking/opsdroid/default.nix +++ b/nixpkgs/pkgs/applications/networking/opsdroid/default.nix @@ -32,5 +32,6 @@ python3Packages.buildPythonPackage rec { maintainers = with maintainers; [ globin willibutz ]; license = licenses.asl20; platforms = platforms.unix; + mainProgram = "opsdroid"; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 12aa4b8e508c..37e27a884d5d 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,6 +10,7 @@ , qtbase , qtsvg , qttools +, wrapGAppsHook , wrapQtAppsHook , guiSupport ? true @@ -29,18 +30,19 @@ stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-o9zMGjVCXLqdRdXzRs1kFPDMFJXQWBEtWwIfeIyFxJw="; + hash = "sha256-+leX0T+yJUG6F7WbHa3nCexQZmd7RRfK8Uc+suMJ+vI="; }; nativeBuildInputs = [ cmake ninja + wrapGAppsHook wrapQtAppsHook ]; @@ -74,6 +76,8 @@ stdenv.mkDerivation rec { "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ]; + dontWrapGApps = true; + postInstall = lib.optionalString stdenv.isDarwin '' APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"} mkdir -p $out/{Applications,bin} @@ -81,6 +85,10 @@ stdenv.mkDerivation rec { makeWrapper $out/{Applications/$APP_NAME.app/Contents/MacOS,bin}/$APP_NAME ''; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org"; diff --git a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix index a0e2388d16cc..4f3f711d1f2c 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,25 +1,18 @@ { lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, fetchpatch, unzip -, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: +, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "transgui"; - version = "unstable-2022-02-02"; + version = "unstable-2023-10-19"; src = fetchFromGitHub { owner = "transmission-remote-gui"; repo = "transgui"; - rev = "0e2c2a07c1b21b1704c0a4945a111a8aa1050a1a"; - sha256 = "1x9wzii3q9zanpik4xc99jqsfrqch8vjmlx12jrvczxcfy51b1ba"; + rev = "b1f5c2334edb6659c04863ef4a534ba1e57284f0"; + hash = "sha256-XCokcA5lINC9B+qwg0vjkymwa16ZNHRKLI829+X7CvE="; }; - patches = [ - # TDDO: remove when transgui updates for transmission-daemon v3 rpc protocol - (fetchpatch { - url = "https://github.com/transmission-remote-gui/transgui/commit/9275c3fb877dd753a1940d1b900630cdc09a0cc2.patch"; - sha256 = "0w2x7gcxp5kqczdz7ckfqhdz9hhkm62k8gcws54d6km7x9vc1023"; - }) - ]; - nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf @@ -67,6 +60,8 @@ stdenv.mkDerivation rec { cp -r "./lang" "$out/share/transgui" ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "A cross platform front-end for the Transmission BitTorrent client"; homepage = "https://sourceforge.net/p/transgui"; diff --git a/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/nixpkgs/pkgs/applications/networking/pcloud/default.nix index e0249f813a74..09662f4eb56b 100644 --- a/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -121,5 +121,6 @@ stdenv.mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ patryk27 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "pcloud"; }; } diff --git a/nixpkgs/pkgs/applications/networking/protocol/default.nix b/nixpkgs/pkgs/applications/networking/protocol/default.nix index 535cc3aa3171..15067e2d9ab2 100644 --- a/nixpkgs/pkgs/applications/networking/protocol/default.nix +++ b/nixpkgs/pkgs/applications/networking/protocol/default.nix @@ -25,5 +25,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/luismartingarcia/protocol"; license = licenses.gpl3Plus; maintainers = with maintainers; [ teto ]; + mainProgram = "protocol"; }; } diff --git a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 7d53cbbcb8da..85922fea6551 100644 --- a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -52,5 +52,6 @@ buildGoModule rec { To work, use secret-service freedesktop.org API (e.g. Gnome keyring) or pass. ''; + mainProgram = "protonmail-bridge"; }; } diff --git a/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index 50143013b88f..ee2e7ddf3f08 100644 --- a/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -79,5 +79,6 @@ mkDerivation rec { platforms = platforms.all; # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25 broken = stdenv.isDarwin; + mainProgram = "qv2ray"; }; } diff --git a/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix b/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix index 6761741ce9ce..8db9ddacef72 100644 --- a/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix +++ b/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/fleaz/r53-ddns"; description = "A DIY DynDNS tool based on Route53"; maintainers = with maintainers; [ fleaz ]; + mainProgram = "r53-ddns"; }; } diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 052369bfcc92..03d56274bd79 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -4,6 +4,7 @@ , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 +, libfaketime , homepage, version, prefix, hash @@ -59,6 +60,7 @@ stdenv.mkDerivation rec { more which wrapGAppsHook + libfaketime ]; buildInputs = [ @@ -153,7 +155,8 @@ stdenv.mkDerivation rec { # Run upstream installer in the store-path. sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst - ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)" + source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T") + faketime -f "$source_date" ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)" if [ -f "$ICAInstDir/util/setlog" ]; then chmod +x "$ICAInstDir/util/setlog" diff --git a/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix b/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix index 8af457c7d4c2..843322df55f0 100644 --- a/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix @@ -10,21 +10,15 @@ stdenv.mkDerivation rec { pname = "dayon"; - version = "12.0.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${version}"; - hash = "sha256-SCInonMTvBXtiDxWlN8QWNS+8MFB52vloonqfLcAEis="; + hash = "sha256-2Fo+LQvsrDvqEudZxzQBtJHGxrRYUyNyhrPV1xS49pQ="; }; - # https://github.com/RetGal/Dayon/pull/66 - postPatch = '' - substituteInPlace resources/deb/dayon_assisted.desktop resources/deb/dayon_assistant.desktop \ - --replace "Exec=/usr/bin/" "Exec=" - ''; - nativeBuildInputs = [ ant jdk @@ -47,11 +41,15 @@ stdenv.mkDerivation rec { runHook preInstall install -Dm644 build/dayon.jar $out/share/dayon/dayon.jar mkdir -p $out/bin + # jre is in PATH because dayon needs keytool to generate certificates makeWrapper ${jre}/bin/java $out/bin/dayon \ + --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-jar $out/share/dayon/dayon.jar" makeWrapper ${jre}/bin/java $out/bin/dayon_assisted \ + --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assisted.AssistedRunner" makeWrapper ${jre}/bin/java $out/bin/dayon_assistant \ + --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assistant.AssistantRunner" install -Dm644 resources/dayon.png $out/share/icons/hicolor/128x128/apps/dayon.png runHook postInstall diff --git a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 9e3eeb711cb4..6d3d6610cf91 100644 --- a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, cmake, ninja, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 , freerdp, libssh, libgcrypt, gnutls, vte @@ -15,23 +15,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.31"; + version = "1.4.33"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-oEgpav4oQ9Sld9PY4TsutS5xEnhQgOHnpQhDesRFTeQ="; + rev = "v.${finalAttrs.version}"; + sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk="; }; - patches = [ - # https://gitlab.com/Remmina/Remmina/-/merge_requests/2525 - (fetchpatch { - url = "https://gitlab.com/Remmina/Remmina/-/commit/2ce153411597035d0f3db5177d703541e09eaa06.patch"; - hash = "sha256-RV/8Ze9aN4dW49Z+y3z0jFs4dyEWu7DK2FABtmse9Hc="; - }) - ]; - nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; @@ -89,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; - maintainers = with maintainers; [ melsigl ryantm ]; + maintainers = with maintainers; [ bbigras melsigl ryantm ]; platforms = platforms.linux ++ platforms.darwin; }; }) diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix index bf9f59444aae..854fee0b6b65 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix @@ -61,7 +61,7 @@ qt5.mkDerivation rec { meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = "http://x2go.org/"; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix index 6d7923872ec9..44e16e378f55 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "http://x2go.org/"; platforms = lib.platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ averelld mkg20001 ]; + maintainers = with maintainers; [ averelld ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix index 16d5f0952ebc..5bf146995f12 100644 --- a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix +++ b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ]; + mainProgram = "rslsync"; }; } diff --git a/nixpkgs/pkgs/applications/networking/rofi-vpn/default.nix b/nixpkgs/pkgs/applications/networking/rofi-vpn/default.nix index 8ff83db294ff..d900df082076 100644 --- a/nixpkgs/pkgs/applications/networking/rofi-vpn/default.nix +++ b/nixpkgs/pkgs/applications/networking/rofi-vpn/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; + mainProgram = "rofi-vpn"; }; } diff --git a/nixpkgs/pkgs/applications/networking/rymdport/default.nix b/nixpkgs/pkgs/applications/networking/rymdport/default.nix index b9f4838f58bf..cb7d99b04799 100644 --- a/nixpkgs/pkgs/applications/networking/rymdport/default.nix +++ b/nixpkgs/pkgs/applications/networking/rymdport/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.linux; + mainProgram = "rymdport"; }; } diff --git a/nixpkgs/pkgs/applications/networking/scaleft/default.nix b/nixpkgs/pkgs/applications/networking/scaleft/default.nix index d31d56702ace..bcfde9f1a005 100644 --- a/nixpkgs/pkgs/applications/networking/scaleft/default.nix +++ b/nixpkgs/pkgs/applications/networking/scaleft/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ jloyet ]; platforms = [ "x86_64-linux" ]; + mainProgram = "sft"; }; } diff --git a/nixpkgs/pkgs/applications/networking/seafile-client/default.nix b/nixpkgs/pkgs/applications/networking/seafile-client/default.nix index c7d4508c060c..4da47eddd61b 100644 --- a/nixpkgs/pkgs/applications/networking/seafile-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/seafile-client/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ schmittlauch greizgh ]; + mainProgram = "seafile-applet"; }; } diff --git a/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index e87ea1bbe514..bc722b91fa02 100644 --- a/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -56,5 +56,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ otavio ]; platforms = platforms.linux; + mainProgram = "agent"; }; } diff --git a/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix index 46fc2a7ae170..a3f78b5d5951 100644 --- a/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix +++ b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ das_j ]; + mainProgram = "sieve-connect"; }; } diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index fb3399ee569b..e33af52e45e5 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -29,7 +29,9 @@ , makeWrapper , minizip , nghttp2 +, nghttp3 , ninja +, opencore-amr , openssl , pcre2 , perl @@ -52,7 +54,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.0.10"; + version = "4.2.0"; outputs = [ "out" "dev" ]; @@ -60,11 +62,11 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-R8CoatIZC7vkKn4UZ3G7h5qBexfKMdJJ0swi+IxAjG0="; + hash = "sha256-0ny2x5sGG/T7q8RehCKVH/vrSihWytvUDVYiMnfhh9s="; }; patches = [ - ./wireshark-lookup-dumpcap-in-path.patch + ./patches/lookup-dumpcap-in-path.patch ]; depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -87,30 +89,32 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + bcg729 + c-ares gettext - pcre2 - libpcap - lua5 - libssh - nghttp2 - openssl + glib + gnutls libgcrypt libgpg-error - gnutls + libkrb5 libmaxminddb libopus - bcg729 - spandsp3 - libkrb5 - speexdsp + libpcap libsmi + libssh + lua5 lz4 - snappy - zstd minizip - c-ares - glib + nghttp2 + nghttp3 + opencore-amr + openssl + pcre2 + snappy + spandsp3 + speexdsp zlib + zstd ] ++ lib.optionals withQt (with qt6; [ qt5compat qtbase @@ -133,21 +137,19 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" - "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444 "-DCMAKE_INSTALL_LIBDIR=lib" + "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" "-DLEMON_C_COMPILER=cc" - "-DUSE_qt6=ON" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-DHAVE_C99_VSNPRINTF_EXITCODE=0" "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT=" + "-DHAVE_C99_VSNPRINTF_EXITCODE=0" ]; # Avoid referencing -dev paths because of debug assertions. env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; dontFixCmake = true; - # Prevent double-wrapping, inject wrapper args manually instead. dontWrapGApps = true; shellHook = '' @@ -160,10 +162,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # to remove "cycle detected in the references" - mkdir -p $dev/lib/wireshark - mv $out/lib/wireshark/cmake $dev/lib/wireshark - '' + (if stdenv.isDarwin && withQt then '' + cmake --install . --prefix "''${!outputDev}" --component Development + '' + lib.optionalString (stdenv.isDarwin && withQt) '' mkdir -p $out/Applications mv $out/bin/Wireshark.app $out/Applications/Wireshark.app @@ -172,21 +172,7 @@ stdenv.mkDerivation rec { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - '' else - lib.optionalString withQt '' - pwd - - mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} - - cp config.h $dev/include/wireshark/ - cp ../epan/*.h $dev/include/epan/ - cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ - cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ - cp ../include/ws_*.h $dev/include/ - cp ../wiretap/*.h $dev/include/wiretap/ - cp ../wsutil/*.h $dev/include/wsutil/ - cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ - ''); + ''; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/patches/lookup-dumpcap-in-path.patch b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/patches/lookup-dumpcap-in-path.patch new file mode 100644 index 000000000000..4285541bbfa9 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/patches/lookup-dumpcap-in-path.patch @@ -0,0 +1,59 @@ +From 2f0cbc740a0fe050f4de082620296c5eea18eba3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> +Date: Thu, 27 Oct 2022 20:56:07 +0200 +Subject: [PATCH] Lookup dumpcap in PATH + +NixOS patch: Look for dumpcap in PATH first, because there may be a +dumpcap wrapper that we want to use instead of the default +non-setuid dumpcap binary. + +Also change execv() to execvp() because we've set argv[0] to "dumpcap" +and have to enable PATH lookup. Wireshark is not a setuid program, so +looking in PATH is not a security issue. + +ORIGINALLY by Björn Forsman + +EDITED by teto for wireshark 3.6 + +EDITED by esclear for wireshark 4.0 + +EDITED by paveloom for wireshark 4.2 + +Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de> +--- + capture/capture_sync.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/capture/capture_sync.c b/capture/capture_sync.c +index 01e9510a27..e439098298 100644 +--- a/capture/capture_sync.c ++++ b/capture/capture_sync.c +@@ -225,8 +225,15 @@ init_pipe_args(int *argc) { + char *exename; + char **argv; + +- /* Find the absolute path of the dumpcap executable. */ +- exename = get_executable_path("dumpcap"); ++ /* NixOS patch: Look for dumpcap in PATH first, because there may be a ++ * dumpcap wrapper that we want to use instead of the default ++ * non-setuid dumpcap binary. */ ++ if (system("command -v dumpcap >/dev/null") == 0) { ++ exename = ws_strdup_printf("dumpcap"); ++ } else { ++ /* Use dumpcap from the package. */ ++ exename = get_executable_path("dumpcap"); ++ } + if (exename == NULL) { + return NULL; + } +@@ -533,7 +540,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, + dup2(sync_pipe[PIPE_WRITE], 2); + ws_close(sync_pipe[PIPE_READ]); + ws_close(sync_pipe[PIPE_WRITE]); +- execv(argv[0], argv); ++ execvp(argv[0], argv); + sync_pipe_write_int_msg(2, SP_EXEC_FAILED, errno); + + /* Exit with "_exit()", so that we don't close the connection +-- +2.42.0 diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch deleted file mode 100644 index 0e523db0a32a..000000000000 --- a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 2f0cbc740a0fe050f4de082620296c5eea18eba3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> -Date: Thu, 27 Oct 2022 20:56:07 +0200 -Subject: [PATCH] Lookup dumpcap in PATH - -NixOS patch: Look for dumpcap in PATH first, because there may be a -dumpcap wrapper that we want to use instead of the default -non-setuid dumpcap binary. - -Also change execv() to execvp() because we've set argv[0] to "dumpcap" -and have to enable PATH lookup. Wireshark is not a setuid program, so -looking in PATH is not a security issue. - -ORIGINALLY by Björn Forsman - -EDITED by teto for wireshark 3.6 - -EDITED by esclear for wireshark 4.0 - -Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de> ---- - capture/capture_sync.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/capture/capture_sync.c b/capture/capture_sync.c -index fc5552f02c..a556f109af 100644 ---- a/capture/capture_sync.c -+++ b/capture/capture_sync.c -@@ -239,7 +239,18 @@ init_pipe_args(int *argc) { - #ifdef _WIN32 - exename = ws_strdup_printf("%s\\dumpcap.exe", progfile_dir); - #else -- exename = ws_strdup_printf("%s/dumpcap", progfile_dir); -+ /* -+ * NixOS patch: Look for dumpcap in PATH first, because there may be a -+ * dumpcap wrapper that we want to use instead of the default -+ * non-setuid dumpcap binary. -+ */ -+ if (system("command -v dumpcap >/dev/null") == 0) { -+ /* Found working dumpcap */ -+ exename = ws_strdup_printf("dumpcap"); -+ } else { -+ /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */ -+ exename = ws_strdup_printf("%s/dumpcap", progfile_dir); -+ } - #endif - - /* Make that the first argument in the argument list (argv[0]). */ -@@ -690,7 +701,7 @@ sync_pipe_start(capture_options *capture_opts, GPtrArray *capture_comments, - */ - dup2(sync_pipe[PIPE_WRITE], 2); - ws_close(sync_pipe[PIPE_READ]); -- execv(argv[0], argv); -+ execvp(argv[0], argv); - snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); - sync_pipe_errmsg_to_parent(2, errmsg, ""); -@@ -946,7 +957,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, - dup2(sync_pipe[PIPE_WRITE], 2); - ws_close(sync_pipe[PIPE_READ]); - ws_close(sync_pipe[PIPE_WRITE]); -- execv(argv[0], argv); -+ execvp(argv[0], argv); - snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - argv[0], g_strerror(errno)); - sync_pipe_errmsg_to_parent(2, errmsg, ""); diff --git a/nixpkgs/pkgs/applications/networking/sniffnet/default.nix b/nixpkgs/pkgs/applications/networking/sniffnet/default.nix index afa496f5ab61..b3cb5316ec0c 100644 --- a/nixpkgs/pkgs/applications/networking/sniffnet/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffnet/default.nix @@ -61,5 +61,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/gyulyvgc/sniffnet/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "sniffnet"; }; } diff --git a/nixpkgs/pkgs/applications/networking/sniproxy/default.nix b/nixpkgs/pkgs/applications/networking/sniproxy/default.nix index 8d2b619ab718..778681063b61 100644 --- a/nixpkgs/pkgs/applications/networking/sniproxy/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniproxy/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ womfoo raitobezarius ]; platforms = platforms.linux; + mainProgram = "sniproxy"; }; } diff --git a/nixpkgs/pkgs/applications/networking/soapui/default.nix b/nixpkgs/pkgs/applications/networking/soapui/default.nix index fc515590f37a..df54826608b6 100644 --- a/nixpkgs/pkgs/applications/networking/soapui/default.nix +++ b/nixpkgs/pkgs/applications/networking/soapui/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = "SoapUI End User License Agreement"; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; + mainProgram = "soapui"; }; } diff --git a/nixpkgs/pkgs/applications/networking/soju/default.nix b/nixpkgs/pkgs/applications/networking/soju/default.nix index d4e6d7a393f2..f8d6e3044314 100644 --- a/nixpkgs/pkgs/applications/networking/soju/default.nix +++ b/nixpkgs/pkgs/applications/networking/soju/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "soju"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "soju"; rev = "v${version}"; - hash = "sha256-Icz6oIXLnLe75zuB8Q862I1ado5GpGZBJezrH7F7EJs="; + hash = "sha256-nzaYa4h+UZcP6jqFHxVjgQ/F3q9aOeOPgVKFWBy6Fag="; }; - vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4="; + vendorHash = "sha256-JLght6bOrtc/VP3tfQboASa68VL2GGBTdK02DOC5EQk="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/applications/networking/spideroak/default.nix b/nixpkgs/pkgs/applications/networking/spideroak/default.nix index 0bfc62ccfbb2..c1531a25b548 100644 --- a/nixpkgs/pkgs/applications/networking/spideroak/default.nix +++ b/nixpkgs/pkgs/applications/networking/spideroak/default.nix @@ -57,5 +57,6 @@ in stdenv.mkDerivation { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ amorsillo ]; platforms = lib.platforms.linux; + mainProgram = "spideroak"; }; } diff --git a/nixpkgs/pkgs/applications/networking/station/default.nix b/nixpkgs/pkgs/applications/networking/station/default.nix index 9160568ee483..43392ae28e48 100644 --- a/nixpkgs/pkgs/applications/networking/station/default.nix +++ b/nixpkgs/pkgs/applications/networking/station/default.nix @@ -37,5 +37,6 @@ in appimageTools.wrapType2 rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ]; + mainProgram = "station"; }; } diff --git a/nixpkgs/pkgs/applications/networking/stc-cli/default.nix b/nixpkgs/pkgs/applications/networking/stc-cli/default.nix index bae71f82cb4e..bfc2d1e84d29 100644 --- a/nixpkgs/pkgs/applications/networking/stc-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/stc-cli/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { changelog = "https://github.com/tenox7/stc/releases/tag/${version}"; license = licenses.asl20; maintainers = [ maintainers.ivankovnatsky ]; + mainProgram = "stc"; }; } diff --git a/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix b/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix index 7386c32c279c..5e56e5be7117 100644 --- a/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-U+2imF4hUDJAwwf/RFZXfOgTxA+O8c6C+CzQoEQreJw="; + hash = "sha256-fJK3UTa5NS+dSsjnqZtRN3HmHQ1bYU2jepkJ5tchYD4="; }; - cargoHash = "sha256-9DrJoXT/uD8y7y2r58DMuURSaic+TtlnPPbw/gq9jPA="; + cargoHash = "sha256-/0w52bh9CsBoMTJsnWuEAQNgQzf92mbzh53H4iQYswc="; postPatch = '' pushd $cargoDepsCopy/librclone-sys diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index 26343f6a76ef..5d055d59e27a 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.64.2"; + version = "1.65.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-gOFOcqCgFAiTc6W3v8Z917hGCzxluswqnuOoUht73GA="; + hash = "sha256-hlkX8JrBz/hFwQj0xCZfuBt2t3CP3Xa1JkNDH0zomxg="; }; - vendorHash = "sha256-eYIGVCTvUfGbsIMFthEfD0r6aeA7Ly9xJ8PJ6hR2SjA="; + vendorHash = "sha256-qKRIT2HqNDpEtZBNHZMXp4Yhh5fCkQSTPU5MQ7FmCHI="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix index 154906bf2eea..435a3e1060f3 100644 --- a/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.90.2"; + version = "1.92.1"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-VEO9LV6hzEd4IDnSPE5H0CDlwgRFEg4cheDx/RUGQug="; + hash = "sha256-yeKI8vOuYFhABz09awPuCmjrifLttvBq1kaxMf78/HI="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-R713WhFrWT7Cgstk3SLuvvyk3/ZtT1LOH0qqmFcWzKw="; + vendorHash = "sha256-odtCBLg04gG1ztyDLdBADhdEhMkrizNjOGymAtzXy9g="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/nixpkgs/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix index 3ceb5c0e1afd..77ad4dad40d0 100644 --- a/nixpkgs/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix +++ b/nixpkgs/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix @@ -39,5 +39,6 @@ qt5.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ kalbasit ]; platforms = [ "x86_64-linux" ]; + mainProgram = "SynologyCloudSyncDecryptionTool"; }; } diff --git a/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix b/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix index 34d33e326ab4..7d3efef57de9 100644 --- a/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix @@ -11,6 +11,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ jcouyang MoritzBoehme ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "synology-drive"; }; passthru.updateScript = writeScript "update-synology-drive-client" '' #!/usr/bin/env nix-shell diff --git a/nixpkgs/pkgs/applications/networking/taler/default.nix b/nixpkgs/pkgs/applications/networking/taler/default.nix index 748c97b51b62..6ba4bac67fcb 100644 --- a/nixpkgs/pkgs/applications/networking/taler/default.nix +++ b/nixpkgs/pkgs/applications/networking/taler/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd_0_9_72 +{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd_0_9_74 , qrencode, libsodium, libtool, libunistring, pkg-config, postgresql , autoreconfHook, python39, recutils, wget, jq, gettext, texinfo }: let - version = "0.9.2"; + version = "0.9.3"; taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; rev = "v${version}"; - sha256 = "sha256-DTnwj/pkowR1b1+N94pnuLykD2O37Nh8AKhUIzY7NaU="; + sha256 = "sha256-uwbgIzSjLN+KQCY134VfnCuBEtvCO3a6mEw++HoZDHs="; }; - in rec { taler-exchange = stdenv.mkDerivation rec { pname = "taler-exchange"; @@ -20,8 +19,12 @@ in rec { src = fetchgit { url = "https://git.taler.net/exchange.git"; rev = "v${version}"; + # REMOVEME: this should only be a problem for specifically v0.9.3 + # When fetching submodules without deep clone we get the following error: + # "Server does not allow request for unadvertised object" + deepClone = true; fetchSubmodules = true; - sha256 = "sha256-c0cX38hDIZGVhHrD9LgDU70dF2AYuZmsakC8yDyZE54="; + sha256 = "sha256-txWwW5vqTblNgVIXdDkpNNZOXpY0udMaz4Wog1GobzE="; }; nativeBuildInputs = [ @@ -30,7 +33,7 @@ in rec { ]; buildInputs = [ libgcrypt - libmicrohttpd_0_9_72 + libmicrohttpd_0_9_74 jansson libsodium postgresql @@ -40,11 +43,13 @@ in rec { texinfo # Fix 'makeinfo' is missing on your system. libunistring python39.pkgs.jinja2 + # jq is necessary for some tests and is checked by configure script + jq ]; propagatedBuildInputs = [ gnunet ]; preConfigure = '' - ./contrib/gana-update.sh + ./contrib/gana-generate.sh ''; enableParallelBuilding = true; @@ -78,7 +83,8 @@ in rec { src = fetchgit { url = "https://git.taler.net/merchant.git"; rev = "v${version}"; - sha256 = "sha256-NPK8yhuTtZZiWE7OsUMdlb2aycegPzRFud41xHE9IL8="; + fetchSubmodules = true; + sha256 = "sha256-HewCqyO/7nnIQY9Tgva0k1nTk2LuwLyGK/UUxvx9BG0="; }; postUnpack = '' ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ @@ -93,6 +99,14 @@ in rec { ]; propagatedBuildInputs = [ gnunet ]; + # From ./bootstrap + preAutoreconf = '' + cd 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 .. + ''; configureFlags = [ "--with-gnunet=${gnunet}" "--with-exchange=${taler-exchange}" diff --git a/nixpkgs/pkgs/applications/networking/tcping-go/default.nix b/nixpkgs/pkgs/applications/networking/tcping-go/default.nix index 1502f8a16aef..950c648337ad 100644 --- a/nixpkgs/pkgs/applications/networking/tcping-go/default.nix +++ b/nixpkgs/pkgs/applications/networking/tcping-go/default.nix @@ -18,5 +18,6 @@ buildGoModule { homepage = "https://github.com/cloverstd/tcping"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "tcping"; }; } diff --git a/nixpkgs/pkgs/applications/networking/tcpkali/default.nix b/nixpkgs/pkgs/applications/networking/tcpkali/default.nix index fa0236dcd8c2..805a70f88e74 100644 --- a/nixpkgs/pkgs/applications/networking/tcpkali/default.nix +++ b/nixpkgs/pkgs/applications/networking/tcpkali/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ethercrow ]; + mainProgram = "tcpkali"; }; } diff --git a/nixpkgs/pkgs/applications/networking/termius/default.nix b/nixpkgs/pkgs/applications/networking/termius/default.nix index f2d8b8d68541..deaa49e4f66d 100644 --- a/nixpkgs/pkgs/applications/networking/termius/default.nix +++ b/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ Br1ght0ne th0rgal ]; platforms = [ "x86_64-linux" ]; + mainProgram = "termius-app"; }; } diff --git a/nixpkgs/pkgs/applications/networking/testssl/default.nix b/nixpkgs/pkgs/applications/networking/testssl/default.nix index b5f8285087a7..a8e60b9b9439 100644 --- a/nixpkgs/pkgs/applications/networking/testssl/default.nix +++ b/nixpkgs/pkgs/applications/networking/testssl/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://testssl.sh/"; license = licenses.gpl2Only; maintainers = with maintainers; [ etu ]; + mainProgram = "testssl.sh"; }; } diff --git a/nixpkgs/pkgs/applications/networking/tmpmail/default.nix b/nixpkgs/pkgs/applications/networking/tmpmail/default.nix index d29d5816f449..8c72fdd435e5 100644 --- a/nixpkgs/pkgs/applications/networking/tmpmail/default.nix +++ b/nixpkgs/pkgs/applications/networking/tmpmail/default.nix @@ -29,5 +29,6 @@ stdenvNoCC.mkDerivation rec { description = "A temporary email right from your terminal written in POSIX sh "; license = licenses.mit; maintainers = [ maintainers.lom ]; + mainProgram = "tmpmail"; }; } diff --git a/nixpkgs/pkgs/applications/networking/trayscale/default.nix b/nixpkgs/pkgs/applications/networking/trayscale/default.nix index ad4c40cd4ad2..023b72b88837 100644 --- a/nixpkgs/pkgs/applications/networking/trayscale/default.nix +++ b/nixpkgs/pkgs/applications/networking/trayscale/default.nix @@ -50,5 +50,6 @@ buildGoModule rec { homepage = "https://github.com/DeedleFake/trayscale"; license = licenses.mit; maintainers = with maintainers; [ k900 ]; + mainProgram = "trayscale"; }; } diff --git a/nixpkgs/pkgs/applications/networking/twtxt/default.nix b/nixpkgs/pkgs/applications/networking/twtxt/default.nix index 7d703d2db4ff..eb216b1df861 100644 --- a/nixpkgs/pkgs/applications/networking/twtxt/default.nix +++ b/nixpkgs/pkgs/applications/networking/twtxt/default.nix @@ -33,5 +33,6 @@ buildPythonApplication rec { homepage = "https://github.com/buckket/twtxt"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; + mainProgram = "twtxt"; }; } diff --git a/nixpkgs/pkgs/applications/networking/umurmur/default.nix b/nixpkgs/pkgs/applications/networking/umurmur/default.nix index 9af0fb7b73ca..5af5c568e463 100644 --- a/nixpkgs/pkgs/applications/networking/umurmur/default.nix +++ b/nixpkgs/pkgs/applications/networking/umurmur/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; + mainProgram = "umurmurd"; }; } diff --git a/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix b/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix index d9ee62affa3b..928c7a69fd8c 100644 --- a/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix +++ b/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + mainProgram = "upnp-router-control"; }; } diff --git a/nixpkgs/pkgs/applications/networking/versus/default.nix b/nixpkgs/pkgs/applications/networking/versus/default.nix index 57b14ed54c72..4e2ca164fda1 100644 --- a/nixpkgs/pkgs/applications/networking/versus/default.nix +++ b/nixpkgs/pkgs/applications/networking/versus/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/INFURA/versus"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + mainProgram = "versus"; }; } diff --git a/nixpkgs/pkgs/applications/networking/warp/default.nix b/nixpkgs/pkgs/applications/networking/warp/default.nix index e8bf21b19ed0..b39b102c2f2f 100644 --- a/nixpkgs/pkgs/applications/networking/warp/default.nix +++ b/nixpkgs/pkgs/applications/networking/warp/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.5.4"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-twK0C2BvD3GLmJ9H05sas0bce/dIMIWeCoFRU/f+1eg="; + hash = "sha256-Uc9N2kRTpi9cCFskngkiclLpEcp4dtI2mhldG4s/GFY="; }; postPatch = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mxM+V4gWGfW8M56+kV/Ljtzde7oRPH0twJtEImkUIF4="; + hash = "sha256-GN9TjsGBU3D/mc6/XtRAk5pliKRPTQ9f3fMdS6weCaE="; }; nativeBuildInputs = [ @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.all; + mainProgram = "warp"; }; } diff --git a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/default.nix b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/default.nix index 49471ebf7e39..4b8c5096cc5d 100644 --- a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/default.nix +++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/default.nix @@ -12,5 +12,6 @@ bundlerApp { license = licenses.mit; maintainers = [ maintainers.manveru ]; platforms = platforms.all; + mainProgram = "wayback_machine_downloader"; }; } diff --git a/nixpkgs/pkgs/applications/networking/websocketd/default.nix b/nixpkgs/pkgs/applications/networking/websocketd/default.nix index 212850dcc7f5..92a65320b8c5 100644 --- a/nixpkgs/pkgs/applications/networking/websocketd/default.nix +++ b/nixpkgs/pkgs/applications/networking/websocketd/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "http://websocketd.com/"; maintainers = [ maintainers.bjornfor ]; license = licenses.bsd2; + mainProgram = "websocketd"; }; } diff --git a/nixpkgs/pkgs/applications/networking/wg-bond/default.nix b/nixpkgs/pkgs/applications/networking/wg-bond/default.nix index 0c8c629208af..f3dec5e6ab07 100644 --- a/nixpkgs/pkgs/applications/networking/wg-bond/default.nix +++ b/nixpkgs/pkgs/applications/networking/wg-bond/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://gitlab.com/cab404/wg-bond/-/releases#v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ cab404 ]; + mainProgram = "wg-bond"; }; } diff --git a/nixpkgs/pkgs/applications/networking/wgcf/default.nix b/nixpkgs/pkgs/applications/networking/wgcf/default.nix index 9b6db44f437e..a975f1c26cef 100644 --- a/nixpkgs/pkgs/applications/networking/wgcf/default.nix +++ b/nixpkgs/pkgs/applications/networking/wgcf/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/ViRb3/wgcf"; license = licenses.mit; maintainers = with maintainers; [ yureien ]; + mainProgram = "wgcf"; }; } diff --git a/nixpkgs/pkgs/applications/networking/wgnord/default.nix b/nixpkgs/pkgs/applications/networking/wgnord/default.nix index a85c318c65d7..0e73d07616a7 100644 --- a/nixpkgs/pkgs/applications/networking/wgnord/default.nix +++ b/nixpkgs/pkgs/applications/networking/wgnord/default.nix @@ -61,5 +61,6 @@ resholve.mkDerivation rec { changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}"; maintainers = with lib.maintainers; [ urandom ]; license = licenses.mit; + mainProgram = "wgnord"; }; } diff --git a/nixpkgs/pkgs/applications/networking/yaup/default.nix b/nixpkgs/pkgs/applications/networking/yaup/default.nix index 5894e758e9d9..a5c49ece00d1 100644 --- a/nixpkgs/pkgs/applications/networking/yaup/default.nix +++ b/nixpkgs/pkgs/applications/networking/yaup/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; # ld: unknown option: --export-dynamic broken = stdenv.isDarwin; + mainProgram = "yaup"; }; } diff --git a/nixpkgs/pkgs/applications/networking/znc/modules.nix b/nixpkgs/pkgs/applications/networking/znc/modules.nix index 1620c2878eea..243867335955 100644 --- a/nixpkgs/pkgs/applications/networking/znc/modules.nix +++ b/nixpkgs/pkgs/applications/networking/znc/modules.nix @@ -123,14 +123,14 @@ in palaver = zncDerivation rec { pname = "znc-palaver"; - version = "2020-07-18"; + version = "1.2.2"; module_name = "palaver"; src = fetchFromGitHub { owner = "cocodelabs"; repo = "znc-palaver"; - rev = "825cb6814d64006ca0f85fec23fa0a8a3a2d14ca"; - sha256 = "zXWPIxhO5Z2L6f+Hf3vIpEh6V4kjUONWAaKexKLECc8="; + rev = version; + hash = "sha256-8W3uF1PrLQiEZm7JaFrpqmJLSFioa4F4qlM1J6Zua8U="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/office/foliate/default.nix b/nixpkgs/pkgs/applications/office/foliate/default.nix index 294121b32ecd..80b6122fa7b6 100644 --- a/nixpkgs/pkgs/applications/office/foliate/default.nix +++ b/nixpkgs/pkgs/applications/office/foliate/default.nix @@ -1,38 +1,52 @@ -{ stdenv, lib, fetchFromGitHub, meson, gettext, glib, gjs, ninja, python3, gtk3 -, webkitgtk, gsettings-desktop-schemas, wrapGAppsHook, desktop-file-utils -, gobject-introspection, glib-networking }: +{ stdenv +, lib +, fetchFromGitHub +, meson +, gettext +, glib +, gjs +, ninja +, gtk4 +, webkitgtk_6_0 +, gsettings-desktop-schemas +, wrapGAppsHook4 +, desktop-file-utils +, gobject-introspection +, glib-networking +, pkg-config +, libadwaita +}: stdenv.mkDerivation rec { pname = "foliate"; - version = "2.6.4"; + version = "3.0.1"; src = fetchFromGitHub { owner = "johnfactotum"; repo = pname; rev = version; - sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc="; + hash = "sha256-ksjd/H62c9dhoOXQtrKqexAjLMGd/adP/fL78fYRi/Y="; + fetchSubmodules = true; }; - nativeBuildInputs = [ meson ninja python3 wrapGAppsHook gobject-introspection ]; - - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - ''; - - postFixup = '' - sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.github.johnfactotum.Foliate';" $out/bin/.com.github.johnfactotum.Foliate-wrapped - ln -s $out/bin/com.github.johnfactotum.Foliate $out/bin/foliate - ''; + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; buildInputs = [ gettext + gjs glib glib-networking - gjs - gtk3 - webkitgtk - desktop-file-utils gsettings-desktop-schemas + gtk4 + libadwaita + webkitgtk_6_0 ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/office/gnote/default.nix b/nixpkgs/pkgs/applications/office/gnote/default.nix index 7caa8d2d5395..f75b0a709c7e 100644 --- a/nixpkgs/pkgs/applications/office/gnote/default.nix +++ b/nixpkgs/pkgs/applications/office/gnote/default.nix @@ -3,8 +3,7 @@ , fetchurl , desktop-file-utils , gettext -, gspell -, gtkmm3 +, gtkmm4 , itstool , libsecret , libuuid @@ -13,22 +12,21 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gnome }: stdenv.mkDerivation rec { pname = "gnote"; - version = "44.1"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-aWelUGgiMguuGcHrC8dFFmRPnp61TtwslCU+rhDHYE0="; + hash = "sha256-XRb9h9FA7HL7s1ewVp2u+4Io4HgUcBVG5r3mVyGTwko="; }; buildInputs = [ - gspell - gtkmm3 + gtkmm4 libsecret libuuid libxml2 @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; passthru = { diff --git a/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/nixpkgs/pkgs/applications/office/gnumeric/default.nix index 785b069c9a5b..d0331a742472 100644 --- a/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.55"; + version = "1.12.56"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xpoJzRkLYirMpHa7w9TAPWjXzPWbumG/A2zmCIX5+2U="; + sha256 = "UaOPNaxbD3He+oueIL8uCFY3mPHLMzeamhdyb7Hj4bI="; }; configureFlags = [ "--disable-component" ]; diff --git a/nixpkgs/pkgs/applications/office/homebank/default.nix b/nixpkgs/pkgs/applications/office/homebank/default.nix index 105ec8456895..653eaf63f84c 100644 --- a/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-fwqSnXde7yalqfKfo8AT8+762/aYLMCGp8dd3bm09Ck="; + url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; + hash = "sha256-Mx1++I2Q8/NMpmEPfxjonpNUQ7GLCRqH2blL11Vjme8="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free, easy, personal accounting for everyone"; - homepage = "http://homebank.free.fr/"; + homepage = "https://www.gethomebank.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/applications/office/jabref/default.nix b/nixpkgs/pkgs/applications/office/jabref/default.nix index dffaf7940678..e2f918bfdd50 100644 --- a/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , wrapGAppsHook , makeDesktopItem , copyDesktopItems @@ -20,21 +21,18 @@ let snapshot = "2.2.1-SNAPSHOT"; pin = "2.2.1-20230117.075740-16"; }; - afterburner = { - snapshot = "1.1.0-SNAPSHOT"; - pin = "1.1.0-20221226.155809-7"; - }; }; in stdenv.mkDerivation rec { - version = "5.10"; + version = "5.11"; pname = "jabref"; src = fetchFromGitHub { owner = "JabRef"; repo = "jabref"; rev = "v${version}"; - hash = "sha256-Yj4mjXOZVM0dKcMfTjmnZs/kIs8AR0KJ9HKlyPM96j8="; + hash = "sha256-MTnM4QHTFXJt/T8SOWwHlZ1CuegSGjpT3qDaMRi5n18="; + fetchSubmodules = true; }; desktopItems = [ @@ -51,46 +49,41 @@ stdenv.mkDerivation rec { }) ]; - deps = - let - javafx-web = fetchurl { - url = "https://repo1.maven.org/maven2/org/openjfx/javafx-web/20/javafx-web-20.jar"; - hash = "sha256-qRtVN34KURlVM5Ie/x25IfKsKsUcux7V2m3LML74G/s="; - }; - in - stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon downloadDependencies -Dos.arch=amd64 - gradle --no-daemon downloadDependencies -Dos.arch=aarch64 - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ - | sh - mv $out/org/jabref/afterburner.fx/${versionReplace.afterburner.pin} \ - $out/org/jabref/afterburner.fx/${versionReplace.afterburner.snapshot} - mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ - $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} - # This jar is required but not used or cached for unknown reason. - cp ${javafx-web} $out/org/openjfx/javafx-web/20/javafx-web-20.jar - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - outputHash = "sha256-XswHEKjzErL+znau/F6mTORVJlFSgVuT0svK29v5dEU="; - }; + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit src version patches postPatch; + + nativeBuildInputs = [ gradle perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon downloadDependencies -Dos.arch=amd64 + gradle --no-daemon downloadDependencies -Dos.arch=aarch64 + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ + | sh + mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ + $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} + ''; + # Don't move info to share/ + forceShare = [ "dummy" ]; + outputHashMode = "recursive"; + outputHash = "sha256-sMbAv122EcLPOqbEVKowfxp9B71iJaccLRlKS75b3Xc="; + }; + + patches = [ + # Use JavaFX 21 + (fetchpatch { + url = "https://github.com/JabRef/jabref/commit/2afd1f622a3ab85fc2cf5fa879c5a4d41c245eca.patch"; + hash = "sha256-cs7TSSnEY4Yf5xrqMOpfIA4jVdzM3OQQV/anQxJyy64="; + }) + ]; postPatch = '' # Pin the version substituteInPlace build.gradle \ - --replace 'org.jabref:afterburner.fx:${versionReplace.afterburner.snapshot}' \ - 'org.jabref:afterburner.fx:${versionReplace.afterburner.pin}' \ --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' @@ -98,29 +91,31 @@ stdenv.mkDerivation rec { substituteInPlace src/main/java/org/jabref/preferences/JabRefPreferences.java \ --replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \ 'VERSION_CHECK_ENABLED, Boolean.FALSE' + + # Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326 + cat <<EOF >> build.gradle + task downloadDependencies { + description "Pre-downloads *most* dependencies" + doLast { + configurations.getAsMap().each { name, config -> + println "Retrieving dependencies for $name" + try { + config.files + } catch (e) { + // some cannot be resolved, just log them + project.logger.info e.message + } + } + } + } + EOF ''; preBuild = '' - # Include CSL styles and locales in our build - cp -r buildres/csl/* src/main/resources/ - # Use the local packages from -deps sed -i -e '/repositories {/a maven { url uri("${deps}") }' \ build.gradle \ - buildSrc/build.gradle \ settings.gradle - - # The `plugin {}` block can't resolve plugins from the deps repo - sed -e '/plugins {/,/^}/d' buildSrc/build.gradle > buildSrc/build.gradle.tmp - cat > buildSrc/build.gradle <<EOF - buildscript { - repositories { maven { url uri("${deps}") } } - dependencies { classpath 'org.openjfx:javafx-plugin:0.0.14' } - } - apply plugin: 'java' - apply plugin: 'org.openjfx.javafxplugin' - EOF - cat buildSrc/build.gradle.tmp >> buildSrc/build.gradle ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/khronos/default.nix b/nixpkgs/pkgs/applications/office/khronos/default.nix index 26a435203582..6dfa848c7b88 100644 --- a/nixpkgs/pkgs/applications/office/khronos/default.nix +++ b/nixpkgs/pkgs/applications/office/khronos/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "khronos"; - version = "3.7.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-k3U8ICnwMbR6vN+gELWytI2Etri5lvbE6AX6lUpr7dQ="; + sha256 = "sha256-2mO2ZMDxZ7sx2EVTN0tsAv8MisGxlK/1h61N+hOqyGI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 44d07503b2fa..e49f4be07b2f 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , lib , substituteAll , pam @@ -218,6 +219,12 @@ in stdenv.mkDerivation (finalAttrs: { # runtime closure. This behavior was introduced by upstream in commit # cbfac11330882c7d0a817b6c37a08b2ace2b66f4 ./0001-Strip-away-BUILDCONFIG.patch + + # Backport fix for tests broken by expired test certificates. + (fetchpatch { + url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=ececb678b8362e3be8e02768ddd5e4197d87dc2a"; + hash = "sha256-TUfKlwNxUTOJ95VLqwVD+ez1xhu7bW6xZlgIaCyIiNg="; + }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) diff --git a/nixpkgs/pkgs/applications/office/mendeley/default.nix b/nixpkgs/pkgs/applications/office/mendeley/default.nix index fc3b7216b7a2..81857f99f37d 100644 --- a/nixpkgs/pkgs/applications/office/mendeley/default.nix +++ b/nixpkgs/pkgs/applications/office/mendeley/default.nix @@ -6,27 +6,27 @@ }: let - name = "mendeley"; - version = "2.80.1"; + pname = "mendeley"; + version = "2.105.0"; - executableName = "${name}-reference-manager"; + executableName = "${pname}-reference-manager"; src = fetchurl { - url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-2.80.1-x86_64.AppImage"; - sha256 = "sha256-uqmu7Yf4tXDlNGkeEZut4m339S6ZNKhAmej+epKLB/8="; + url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; + hash = "sha256-vs430WLApRu+Xw2gYgriOD0jsQqTW+qhI1g4r67W9aM="; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; -in appimageTools.wrapType2 rec { - inherit name src; +in appimageTools.wrapType2 { + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${executableName} + mv $out/bin/$name $out/bin/${executableName} install -m 444 -D ${appimageContents}/${executableName}.desktop $out/share/applications/${executableName}.desktop - ${imagemagick}/bin/convert ${appimageContents}/${executableName}.png -resize 512x512 ${name}_512.png - install -m 444 -D ${name}_512.png $out/share/icons/hicolor/512x512/apps/${executableName}.png + ${imagemagick}/bin/convert ${appimageContents}/${executableName}.png -resize 512x512 ${pname}_512.png + install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${executableName}.png substituteInPlace $out/share/applications/${executableName}.desktop \ --replace 'Exec=AppRun' 'Exec=${executableName}' diff --git a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index c5c291511ebb..31816fc203fa 100644 --- a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -20,21 +20,16 @@ }: let - version = "1.17.4"; + version = "2.0.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-Kl8AUfHfEiEy40qeDI8x2rxdXcj01mpitw7T/96ibQQ="; + hash = "sha256-qSX+r99y7a/eITfaC/UYqSgcxx/xYOqJ4tY/iuvoeNA="; }; - # Use specific package versions required by paperless-ngx - python = python3.override { - packageOverrides = self: super: { - django = super.django_4; - }; - }; + python = python3; path = lib.makeBinPath [ ghostscript @@ -52,7 +47,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-5Q9NtIO7k/6AiF9Er10HhmEBFyQOP9CiTkTZglUeChg="; + npmDepsHash = "sha256-uDaZ7j7IDgKy7wCWND2xzR1qHwUtdyjR4eyIAVy01dM="; nativeBuildInputs = [ python3 @@ -92,16 +87,6 @@ python.pkgs.buildPythonApplication rec { inherit version src; - patches = [ - # https://github.com/paperless-ngx/paperless-ngx/pull/4146 - (fetchpatch { - name = "fix-tests-for-python311.patch"; - url = "https://github.com/paperless-ngx/paperless-ngx/commit/73f6c0a056e3859061339e295f57213fd4239b2d.patch"; - hash = "sha256-sZcRug5T4cw5ppKpGYrrfz9RxtYxnkeNOlXcMgdWT0E="; - }) - ]; - - nativeBuildInputs = [ gettext ]; @@ -131,18 +116,24 @@ python.pkgs.buildPythonApplication rec { constantly cryptography dateparser + django-auditlog django-celery-results - django-cors-headers django-compression-middleware + django-cors-headers django-extensions django-filter django-guardian + django-multiselectfield django djangorestframework-guardian2 djangorestframework + drf-writable-nested filelock + flower + gotenberg-client gunicorn h11 + h2 hiredis httptools httpx @@ -178,8 +169,8 @@ python.pkgs.buildPythonApplication rec { python-dateutil python-dotenv python-ipware - python-gnupg python-magic + python-gnupg pytz pyyaml pyzbar @@ -190,8 +181,8 @@ python.pkgs.buildPythonApplication rec { requests scikit-learn scipy - service-identity setproctitle + service-identity sniffio sqlparse threadpoolctl @@ -255,7 +246,6 @@ python.pkgs.buildPythonApplication rec { daphne factory-boy imagehash - pdfminer-six pytest-django pytest-env pytest-httpx diff --git a/nixpkgs/pkgs/applications/office/trilium/desktop.nix b/nixpkgs/pkgs/applications/office/trilium/desktop.nix index dd3f41df5230..48df671bd924 100644 --- a/nixpkgs/pkgs/applications/office/trilium/desktop.nix +++ b/nixpkgs/pkgs/applications/office/trilium/desktop.nix @@ -7,13 +7,13 @@ let pname = "trilium-desktop"; - version = "0.60.4"; + version = "0.62.2"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "02vbghvi2sbh943rslgm712x9zccvpjab3jvr5b1bw4bq5fzppgq"; + linuxSource.sha256 = "17vg22kzg6346c8fb2kzm5zdspb9p24isd2irxhw7gh2z6vnwh1d"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "0z6dk16xdzkiyxrm1yh3iz5351c8sdzvk8v5l3jdqy7davxw9f86"; + darwinSource.sha256 = "03y5wkpdf4hc7724sjipgahlp6nh72z0wgm0qsqji5x5sxpambb8"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/nixpkgs/pkgs/applications/office/trilium/server.nix b/nixpkgs/pkgs/applications/office/trilium/server.nix index 2ac92e36636f..a2b6a3338395 100644 --- a/nixpkgs/pkgs/applications/office/trilium/server.nix +++ b/nixpkgs/pkgs/applications/office/trilium/server.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, autoPatchelfHook, fetchurl, nixosTests +{ stdenv, autoPatchelfHook, fetchurl, nixosTests , metaCommon }: let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "16xyxpxqvzhdq63wc2nzmfabpasypxwm474jf15y3q8kdrca9myv"; - version = "0.60.4"; -in stdenv.mkDerivation rec { + serverSource.sha256 = "0vip61c24n9d6bnpcgg9dwxc604xigmi1ayvm1mmlgah1fk56swg"; + version = "0.62.2"; +in stdenv.mkDerivation { pname = "trilium-server"; inherit version; meta = metaCommon // { diff --git a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index 8376b49b8197..87c0183e7e3d 100644 --- a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.11708"; + version = "11.1.0.11711"; src = if useChineseVersion then fetchurl { url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb"; - hash = "sha256-GcWRrJ0I1Q6D2VK6YsPmd5Uir5LcIBFJa1amV2sUurk="; + hash = "sha256-JHSTZZnOZoTpj8zF4C5PmjTkftEdxbeaqweY3ITiJto="; } else fetchurl { url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb"; - hash = "sha256-J40/wrmMz/r4eb2X/rbxWn04UcSsag7SO3aSqBLFSN4="; + hash = "sha256-2apkSE/8Wm6/OQ4x5n1PE1emhovqOgD0NVTY5QZZTYA="; }; unpackCmd = "dpkg -x $src ."; diff --git a/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 073909b80e5c..faedafbe7af2 100644 --- a/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-4+aP+y7TNCq7zGOK3HCrl1NQOmpOHezfbL9B1vW2AUo="; + hash = "sha256-0l4/isk2DKZ0HBxeuUN+RqB3o/3fWdhFSFCnQ2OiO6Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/nixpkgs/pkgs/applications/radio/fldigi/default.nix index f0882935029d..9c1192333c28 100644 --- a/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.2.00"; + version = "4.2.03"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-F09C6R3mEgYVhS7/MqEBFzfqGKbyrAem5/+QDlwI+9k="; + hash = "sha256-tcJYpIeFgoC+jXIdvc1ix+/6v9oPccfxgQbL0wIIKaY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/radio/limesuite/default.nix b/nixpkgs/pkgs/applications/radio/limesuite/default.nix index c7f1891e2c54..f92b63a9ba98 100644 --- a/nixpkgs/pkgs/applications/radio/limesuite/default.nix +++ b/nixpkgs/pkgs/applications/radio/limesuite/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "23.10.0"; + version = "23.11.0"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "sha256-o58UNc4r+MQbH00727YTV17M7D29BbH8CgUXCORKk7E="; + sha256 = "sha256-f1cXrkVCIc1MqTvlCUBFqzHLhIVueybVxipNZRlF2gE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/radio/qlog/default.nix b/nixpkgs/pkgs/applications/radio/qlog/default.nix index 098b51954a4e..03add3ba34f9 100644 --- a/nixpkgs/pkgs/applications/radio/qlog/default.nix +++ b/nixpkgs/pkgs/applications/radio/qlog/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Amateur radio logbook software"; license = with licenses; [ gpl3Only ]; homepage = "https://github.com/foldynl/QLog"; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ oliver-koss mkg20001 ]; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/applications/radio/quisk/default.nix b/nixpkgs/pkgs/applications/radio/quisk/default.nix index 785f5cd8d94b..310395c0308a 100644 --- a/nixpkgs/pkgs/applications/radio/quisk/default.nix +++ b/nixpkgs/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.22"; + version = "4.2.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F6xSE1EgWlHlrd4W79tmhTg/FS7QUPH3NWzWIljAAg4="; + sha256 = "sha256-myxWcx1/a9sMv+sfa0Gwjx72t0rGoxn5USEfFgfKEro="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/radio/srsran/default.nix b/nixpkgs/pkgs/applications/radio/srsran/default.nix index c15bb14de47c..a6745d2c406c 100644 --- a/nixpkgs/pkgs/applications/radio/srsran/default.nix +++ b/nixpkgs/pkgs/applications/radio/srsran/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "srsran"; - version = "23.04.1"; + version = "23.11"; src = fetchFromGitHub { owner = "srsran"; repo = "srsran"; rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-4Mwdar1WUIgT23VjI9CtA5FT5gCm0Su+xK5dld3qfho="; + sha256 = "sha256-3cQMZ75I4cyHpik2d/eBuzw7M4OgbKqroCddycw4uW8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix b/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix index 2eef054d5ff5..8fed2a51877f 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "phd2"; - version = "2.6.11"; + version = "2.6.12"; src = fetchFromGitHub { owner = "OpenPHDGuiding"; repo = "phd2"; rev = "v${version}"; - sha256 = "sha256-iautgHOVzdLWYGOVu3wHBDt30uCbaP58mDz/l7buB1k="; + sha256 = "sha256-vq6qhwL8mB5ET/9qFWDZHxqL+RDXRly+CwbRz/wuyZg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix b/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix index bd92ae01ebb1..7fcc588658ae 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix @@ -17,14 +17,18 @@ stdenv.mkDerivation rec { meta = with lib; { description = "sets the X root window to an image of the Earth"; - homepage = "http://xplanet.org"; + homepage = "https://xearth.org"; longDescription = '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, correctly shaded for the current position of the Sun. By default, xearth updates the displayed image every five minutes. ''; maintainers = [ maintainers.mafo ]; - license = "xearth"; + license = { + fullName = "xearth license"; + url = "https://xearth.org/copyright.html"; + free = true; + }; platforms=platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/science/biology/dssp/default.nix b/nixpkgs/pkgs/applications/science/biology/dssp/default.nix index febfde548fd7..006b46db9974 100644 --- a/nixpkgs/pkgs/applications/science/biology/dssp/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/dssp/default.nix @@ -29,13 +29,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.4.1"; + version = "4.4.5"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-sy6GBCnTGRD1YP00dKIolkr1RMboLGcd0f4kU8gCOnA="; + hash = "sha256-X0aMWqoMhmQVRHWKVm2S6JAOYiBuBBMzMoivMdpNx0M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/nixpkgs/pkgs/applications/science/biology/igv/default.nix index 52d388ab023d..a74208c706a1 100644 --- a/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, jdk11 }: +{ lib, stdenv, fetchzip, jdk11, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "igv"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/igv chmod +x $out/bin/igvtools ''; + nativeBuildInputs = [ wrapGAppsHook ]; meta = with lib; { homepage = "https://www.broadinstitute.org/igv/"; diff --git a/nixpkgs/pkgs/applications/science/biology/kent/default.nix b/nixpkgs/pkgs/applications/science/biology/kent/default.nix index f1e891bb85aa..b6e4661ccfd6 100644 --- a/nixpkgs/pkgs/applications/science/biology/kent/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/kent/default.nix @@ -24,16 +24,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace ./src/checkUmask.sh \ --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace ./src/hg/sqlEnvTest.sh \ --replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config" - - runHook postPatch ''; buildPhase = '' diff --git a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix deleted file mode 100644 index f2825eeb97be..000000000000 --- a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, nimPackages, fetchFromGitHub, docopt, hts, pcre }: - -nimPackages.buildNimPackage rec { - pname = "mosdepth"; - version = "0.3.5"; - nimBinOnly = true; - - src = fetchFromGitHub { - owner = "brentp"; - repo = "mosdepth"; - rev = "v${version}"; - sha256 = "sha256-tG3J51PS6A0WBCZ+j/Nf7aaukFV+DZJsxpbTbvwu0zc="; - }; - - buildInputs = [ docopt hts pcre ]; - nimFlags = hts.nimFlags ++ [ "--threads:off" ]; - - meta = with lib; { - description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing"; - license = licenses.mit; - homepage = "https://github.com/brentp/mosdepth"; - maintainers = with maintainers; [ jbedo ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index 0b99c9a849d0..f006df2ae5c0 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.1.43"; + version = "16.1.45"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-lqHlnAeJKbj2Xs9AeAKqdWMWkmD8xWR7f3+nJsBx2YE="; + hash = "sha256-rLq0QrY1M0OptmRZ/dKUVssREnH1im9Ti89AbpsiFtg="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 9c98d7302f2b..b938d1659553 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "7.0.7"; + version = "7.0.9"; src = { - rev = "dc7665e950aa0d42de36e928af48be3b060ba5d1"; - sha256 = "1xbzf29rhqh6kl0vggdn2dblgp927096fc1lr3y4yw63b8n0qq50"; + rev = "1c81053cc40579ecd5febef1aeb1164008039deb"; + sha256 = "1hq9rba1gcks14zwbr8nbicpsil4imslgfch6ll33fhizbks3fq4"; }; }; libVersion = { - version = "7.0.7"; + version = "7.0.9"; libSources = { - symbols.rev = "c7df225d1c79b3ea842c77d928ce1f9bc1a63c5b"; - symbols.sha256 = "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf"; - templates.rev = "1561dd81d116a661a17147c3b941a3e96335eecc"; - templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "ecb85886616b7a6bb957699037f6fb680ce01d30"; - footprints.sha256 = "0xnnivlqgcyaz9qay73p43jnvmvshp2b3fbh3569j7rmgi5pn8x0"; - packages3d.rev = "4fb0672db1d405b661d0cde8edb5d54ac0a95fc7"; - packages3d.sha256 = "141r5wd8s1bgyf77kvb9q14cpsiwwv4zmfzwbgcd42rflsk2lcbc"; + symbols.rev = "1ed4ed6c0696e50165b8e3d7978136a05db2d7c3"; + symbols.sha256 = "0ynsnjq3z126cjkgm1fjbjvdvpc0walnr42ya9dv46l27kxy2j77"; + templates.rev = "856bacc6782ea8c9bcb5a49a2d438a4689e0579b"; + templates.sha256 = "11582ldnv7hkljmhaym83962kixq1hjbfmdrn5laq7l4jk3l19vh"; + footprints.rev = "fe7b9aec7635caabbaa85fa8a15b85038394099b"; + footprints.sha256 = "16a4c2xs4i8wbm01a901yxabxk0qdsjkzlccfawddv82bkh4b87h"; + packages3d.rev = "5bc66f3c0f6dabf09df6c5188b8d955968500eab"; + packages3d.sha256 = "1cly28vc07i54v487zbb8d1h70nrd3naxvq146b0xnbrjwnd2q28"; }; }; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix index c816b3562671..8d28e4da0f14 100644 --- a/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.447"; + version = "8.3.449"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-t/gJ43VIdBIiozLfqaTy7tJsXK674gWBbW1aPHKEj3U="; + sha256 = "sha256-y0+HS1LkIFwcgDbHEvs5SXJY2b340RDT7KVupp+ZX9Y="; }; nativeBuildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/applications/science/geometry/gama/default.nix b/nixpkgs/pkgs/applications/science/geometry/gama/default.nix index 790a9b2d216e..f66770721b0e 100644 --- a/nixpkgs/pkgs/applications/science/geometry/gama/default.nix +++ b/nixpkgs/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.26"; + version = "2.27"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-8zKPPpbp66tD2zMmcv2H5xeCSdDhUk0uYPhqwpGqx9Y="; + sha256 = "sha256-k4s7TK/ym68v40KDzZoMMxDWFMRnsMuk6V/G9P/jM0E="; }; buildInputs = [ expat ]; diff --git a/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix b/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix index c876f77e12f4..3fa4111668eb 100644 --- a/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation { pname = "acgtk"; - version = "1.5.4"; + version = "2.0.0"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "acg"; repo = "dev/acgtk"; - rev = "8e630b6d91bad022bd1d1a075e7768034065c428"; - sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E="; + rev = "release-2.0.0-20231009"; + hash = "sha256-ZymSQkBMBePPw7pJkfLkmqbIkQyIqB+7Pyrih2WAO50="; }; strictDeps = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_3 ]; buildInputs = with ocamlPackages; [ - ansiterminal cairo2 cmdliner fmt logs menhirLib mtime_1 sedlex yojson + ansiterminal cairo2 cmdliner fmt logs menhirLib mtime ocamlgraph readline sedlex yojson ]; buildPhase = '' diff --git a/nixpkgs/pkgs/applications/science/logic/cadical/default.nix b/nixpkgs/pkgs/applications/science/logic/cadical/default.nix index a9b27877ab1e..ddad93b1e18a 100644 --- a/nixpkgs/pkgs/applications/science/logic/cadical/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-hY7+gTwBqQegbm5RjLKhM2vfBOjIRz797Z6wd6usj9s="; + sha256 = "sha256-2cMaBo4u7uqrsp11dc9PHOI9ZBnir51BftPE4C6/U7Q="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix b/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix index 32243455ae5f..2ea2dea70718 100644 --- a/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3, python3 }: stdenv.mkDerivation rec { pname = "easycrypt"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { findlib menhir ocaml + python3.pkgs.wrapPython ]; buildInputs = with ocamlPackages; [ batteries @@ -33,10 +34,13 @@ stdenv.mkDerivation rec { substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})' ''; + pythonPath = with python3.pkgs; [ pyyaml ]; + installPhase = '' runHook preInstall dune install --prefix $out ${pname} rm $out/bin/ec-runtest + wrapPythonProgramsIn "$out/lib/easycrypt/commands" "$pythonPath" runHook postInstall ''; diff --git a/nixpkgs/pkgs/applications/science/logic/lean4/default.nix b/nixpkgs/pkgs/applications/science/logic/lean4/default.nix index ecc929cb5f0e..0f3d9c99ba88 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean4/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean4/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lean4"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-56YtHCiNMP5fJoddSokEl0ws06IwetYLer4aLCnujZA="; + hash = "sha256-2F6sibGMG1U5By/aKGluLgkXIlMpZ7m06gVEG2Uz4RQ="; }; postPatch = '' @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { "-DUSE_GITHASH=OFF" ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + meta = with lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; diff --git a/nixpkgs/pkgs/applications/science/logic/surelog/default.nix b/nixpkgs/pkgs/applications/science/logic/surelog/default.nix index 5c7be408bf4a..3b58331562a2 100644 --- a/nixpkgs/pkgs/applications/science/logic/surelog/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/surelog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.76"; + version = "1.80"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-Vg9NZrgzFRVIsEbZQe8DItDhFOVG1XZoQWBrLzVNwLU="; + hash = "sha256-jpt/5h0HnkiJowyVDoMSyiuL6/dokB4xg1sdyctHrDs="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix b/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix index ec25d58efcbf..6698e47844a2 100644 --- a/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix +++ b/nixpkgs/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.77"; + version = "1.80"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-JKhpcPG4hWlcn2C+Wlx7yNIMXXurAMxLSK4xWN2akMQ="; + hash = "sha256-/aWiN+DPlIjI89u5kx6QoyrGD4DOJTHXxIZ0qHJNDls="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/nixpkgs/pkgs/applications/science/math/bcal/default.nix b/nixpkgs/pkgs/applications/science/math/bcal/default.nix index fedb219a0c19..fdf07a2a3299 100644 --- a/nixpkgs/pkgs/applications/science/math/bcal/default.nix +++ b/nixpkgs/pkgs/applications/science/math/bcal/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jarun/bcal"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix index 536d520058a2..35b9e9d7a8d4 100644 --- a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix b/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix index 6a1bc86abced..ee54def6eb97 100644 --- a/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix +++ b/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { autoSignDarwinBinariesHook ]; + env = { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + NIX_LDFLAGS = "-headerpad_max_install_names"; + }; + dontConfigure = true; buildPhase = diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/default.nix b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix index 289c9b7b6580..c4cebcd8e29a 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/default.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix @@ -77,7 +77,7 @@ callPackage real-drv { homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ herberteuler ]; + maintainers = with maintainers; [ herberteuler rafaelrc ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix b/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix index 7cd699e58e3c..5064a3ddbdf4 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix @@ -158,9 +158,10 @@ in stdenv.mkDerivation { # Remove PATH restriction, root and avahi daemon checks, and hostname call sed -i ' - s/^PATH=/# &/ + s/^\s*PATH=/# &/ s/isRoot="false"/# &/ - s/^checkAvahiDaemon$/# &/ + s/^\s*checkAvahiDaemon$/:/ + s/^\s*installBundledInstall$/:/ s/`hostname`/""/ ' MathInstaller diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix b/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix index 2bcce6c58c3d..74422621c7b4 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/versions.nix @@ -8,6 +8,20 @@ let versions = [ { + version = "13.3.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-0+mYVGiF4Qn3eiLIoINSHVIqT8GtlBPFRYIOF+nHyQo="; + installer = "Mathematica_13.3.1_LINUX.sh"; + } + { + version = "13.3.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-03R4s05fmTcZnlZIMSI6xlLER58MIoccoCr27F8BXOk="; + installer = "Mathematica_13.3.1_BNDL_LINUX.sh"; + } + { version = "13.3.0"; lang = "en"; language = "English"; diff --git a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index d30d560f47fd..23e4ffc8b5a5 100644 --- a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "23.10.0"; + version = "23.11.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - sha256 = "sha256-3zQzpw0KWNAAvML55O2FMlid9j0GtP8OWy1eqifzVwI="; + sha256 = "sha256-QOXRtWFY76aIvRPSN+i8jkvMZvuPO3Yr3yqFOh0PSXY="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix b/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix index c927df9a5491..cdc083a467d8 100644 --- a/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix +++ b/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix @@ -1,59 +1,70 @@ -{ lib, stdenv -, autoPatchelfHook -, buildFHSEnv -, dpkg -, fetchurl -, gcc-unwrapped -, ocl-icd -, zlib -, extraPkgs ? [] +{ lib +, stdenv +, fetchFromGitHub +, scons +, openssl }: let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; - - fahclient = stdenv.mkDerivation rec { - inherit version; - pname = "fahclient"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb"; - sha256 = "2827f05f1c311ee6c7eca294e4ffb856c81957e8f5bfc3113a0ed27bb463b094"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - gcc-unwrapped.lib - zlib - ]; - - unpackPhase = "dpkg-deb -x ${src} ./"; - installPhase = "cp -ar usr $out"; + version = "8.1.18"; + + cbangSrc = fetchFromGitHub { + owner = "cauldrondevelopmentllc"; + repo = "cbang"; + rev = "bastet-v${version}"; + hash = "sha256-G0rknVmZiyC4sRTOowFjf7EQ5peGf+HLPPcLWXXFlX4="; + }; + + fah-web-client-bastetSrc = fetchFromGitHub { + owner = "foldingathome"; + repo = "fah-web-client-bastet"; + rev = "v${version}"; + hash = lib.fakeHash; }; in -buildFHSEnv { - name = fahclient.name; +stdenv.mkDerivation { + pname = "fah-client"; + inherit version; + + src = fetchFromGitHub { + owner = "FoldingAtHome"; + repo = "fah-client-bastet"; + rev = "v${version}"; + hash = "sha256-IgT/5NqCwN8N8OObjtASuT4IRb2EN4bdixxUdjiyddI="; + }; + + nativeBuildInputs = [ scons ]; + + buildInputs = [ openssl ]; + + postUnpack = '' + export CBANG_HOME=$NIX_BUILD_TOP/cbang + + cp -r --no-preserve=mode ${cbangSrc} $CBANG_HOME + ''; + + preBuild = '' + scons -C $CBANG_HOME + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/applications,share/feh-client} + + cp fah-client $out/bin/fah-client - targetPkgs = pkgs': [ - fahclient - ocl-icd - ] ++ extraPkgs; + cp install/lin/fah-client.desktop $out/share/applications/ + cp -r images $out/share/feh-client/ - runScript = "/bin/FAHClient"; + sed -e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" -i $out/share/applications/fah-client.desktop - extraInstallCommands = '' - mv $out/bin/$name $out/bin/FAHClient + runHook postInstall ''; meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; + license = lib.licenses.gpl3; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/applications/science/misc/root/default.nix b/nixpkgs/pkgs/applications/science/misc/root/default.nix index d2172f614f64..3f3b64069bb1 100644 --- a/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -195,6 +195,9 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; + # suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ]; + # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. # TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged. postInstall = '' diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 2ca47d812bbf..e669562c9cc7 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,8 +1,10 @@ { lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit +, plumed , singlePrec ? true , config -, enableMpi ? false , enableCuda ? config.cudaSupport +, enableMpi ? false +, enablePlumed ? false , cpuAcceleration ? null }: @@ -18,20 +20,39 @@ let if stdenv.hostPlatform.system == "aarch64-linux" then "ARM_NEON_ASIMD" else "None"; + source = + if enablePlumed then + { + version = "2023"; + hash = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; + } + else + { + version = "2023.3"; + hash = "sha256-Tsj40MevdrE/j9FtuOLBIOdJ3kOa6VVNn2U/gS140cs="; + }; + in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2023.3"; + version = source.version; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-Tsj40MevdrE/j9FtuOLBIOdJ3kOa6VVNn2U/gS140cs="; + inherit (source) hash; }; patches = [ ./pkgconfig.patch ]; + postPatch = lib.optionalString enablePlumed '' + plumed patch -p -e gromacs-2023 + ''; + outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = + [ cmake ] + ++ lib.optional enablePlumed plumed + ; buildInputs = [ fftw diff --git a/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix b/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix index dd3fef5bf26c..3d9615cf5329 100644 --- a/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix @@ -1,12 +1,11 @@ -{ mkDerivation, lib, fetchurl, qmake }: +{ mkDerivation, lib, fetchzip, qmake }: mkDerivation rec { pname = "xflr5"; - version = "6.47"; - - src = fetchurl { - url = "mirror://sourceforge/xflr5/${pname}_v${version}_src.tar.gz"; - sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav"; + version = "6.61"; + src = fetchzip { + url = "https://sourceforge.net/code-snapshots/svn/x/xf/xflr5/code/xflr5-code-r1481-tags-v6.61-xflr5.zip"; + sha256 = "sha256-voWnXiBo7+kBPiZLVpSiXyBsYJv/Phd3noA81SQ5Vtw="; }; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/applications/science/programming/groove/default.nix b/nixpkgs/pkgs/applications/science/programming/groove/default.nix index e42aa253dbfe..fb314cdff30c 100644 --- a/nixpkgs/pkgs/applications/science/programming/groove/default.nix +++ b/nixpkgs/pkgs/applications/science/programming/groove/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock b/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock index 573daf88941a..e5958e779011 100644 --- a/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock +++ b/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -169,16 +169,15 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", "log", "objc", "objc-foundation", "objc_id", - "once_cell", "parking_lot", "thiserror", "winapi", @@ -199,7 +198,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "4.7.1" +version = "4.7.2" dependencies = [ "asusd", "cargo-husky", @@ -218,7 +217,7 @@ dependencies = [ [[package]] name = "asusd" -version = "4.7.1" +version = "4.7.2" dependencies = [ "async-trait", "cargo-husky", @@ -242,7 +241,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "4.7.1" +version = "4.7.2" dependencies = [ "cargo-husky", "config-traits", @@ -368,13 +367,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -391,7 +390,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -486,9 +485,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bindgen" @@ -582,22 +581,22 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -608,9 +607,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[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 = "cairo-rs" @@ -715,16 +714,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -771,7 +770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -785,7 +784,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "4.7.1" +version = "4.7.2" dependencies = [ "cargo-husky", "log", @@ -1089,7 +1088,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1129,9 +1128,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1296,7 +1295,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1836,7 +1835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.9", + "rustix 0.38.11", "windows-sys 0.48.0", ] @@ -2047,9 +2046,9 @@ dependencies = [ [[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" @@ -2187,16 +2186,15 @@ 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 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", "pin-utils", - "static_assertions", ] [[package]] @@ -2284,7 +2282,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2350,9 +2348,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -2478,9 +2476,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pix" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2b6992b377680150280d4708bda8207ba9e71f70507b5504f2e28d8e8e48c1" +checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81" [[package]] name = "pkg-config" @@ -2661,9 +2659,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -2673,9 +2671,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -2684,13 +2682,13 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rog-control-center" -version = "4.7.1" +version = "4.7.2" dependencies = [ "asusd", "cargo-husky", @@ -2702,7 +2700,7 @@ dependencies = [ "gumdrop", "libappindicator", "log", - "nix 0.26.2", + "nix 0.26.4", "notify-rust", "png_pong", "rog_anime", @@ -2723,7 +2721,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "4.7.1" +version = "4.7.2" dependencies = [ "cargo-husky", "gif", @@ -2740,7 +2738,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "4.7.1" +version = "4.7.2" dependencies = [ "cargo-husky", "log", @@ -2754,7 +2752,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "4.7.1" +version = "4.7.2" dependencies = [ "cargo-husky", "rog_anime", @@ -2766,7 +2764,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "4.7.1" +version = "4.7.2" dependencies = [ "cargo-husky", "concat-idents", @@ -2785,7 +2783,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "4.7.1" +version = "4.7.2" dependencies = [ "cargo-husky", "log", @@ -2798,7 +2796,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "4.7.1" +version = "4.7.2" dependencies = [ "glam", "log", @@ -2866,9 +2864,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ "bitflags 2.4.0", "errno", @@ -2963,7 +2961,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2985,7 +2983,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -3010,9 +3008,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook" @@ -3150,7 +3148,7 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "supergfxctl" version = "5.1.2" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git#c2a1bb3461c7abbcdabecdc463d668555120f953" +source = "git+https://gitlab.com/asus-linux/supergfxctl.git#af23df7596712bb9433a3be917febadeb3f1f419" dependencies = [ "log", "logind-zbus", @@ -3175,9 +3173,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -3241,7 +3239,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.9", + "rustix 0.38.11", "windows-sys 0.48.0", ] @@ -3256,29 +3254,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] name = "time" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "serde", @@ -3364,7 +3362,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -3430,7 +3428,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -3540,9 +3538,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -3591,9 +3589,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -4138,15 +4136,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "nix 0.26.2", + "nix 0.26.4", "winapi", ] [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "1eee6bf5926be7cf998d7381a9a23d833fd493f6a8034658a9505a4dc4b20444" [[package]] name = "zbus" @@ -4172,7 +4170,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "ordered-stream", "rand", diff --git a/nixpkgs/pkgs/applications/system/asusctl/default.nix b/nixpkgs/pkgs/applications/system/asusctl/default.nix index 8b5eb17cbcad..9ff3ac38f8d3 100644 --- a/nixpkgs/pkgs/applications/system/asusctl/default.nix +++ b/nixpkgs/pkgs/applications/system/asusctl/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-T/KAhKoxZRdbJspL+Fkos6YqVhiUxCtxbCSm+8CX1to="; + hash = "sha256-q4V0Cn6kZeyIMGxu/blVi/Ot8LIcv+GlZhpkTQNTjRU="; }; cargoHash = ""; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI="; "notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs="; - "supergfxctl-5.1.2" = "sha256-1XCIltd7o+Bc+UXmeuPAXdPKU86UP0p+Qh0gTZyrbH8="; + "supergfxctl-5.1.2" = "sha256-HJGyjFeN3bq+ArCGfFHAMnjW76wSnNyxPWR0ELcyjLg="; }; }; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix index 1a036106c6df..a1692dd255a2 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix @@ -105,5 +105,6 @@ mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ moni ]; platforms = platforms.unix; + mainProgram = "contour"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 528c82fe8199..6630cbaa1258 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -57,5 +57,6 @@ mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ ]; + mainProgram = "cool-retro-term"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix index 80d3d6187d1a..fc2b470178f3 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ flexagoon ]; + mainProgram = "darktile"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/dterm/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/dterm/default.nix index 69b1f67d629a..b9ab08e9bbbc 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/dterm/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/dterm/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ auchter ]; platforms = platforms.unix; + mainProgram = "dterm"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix index bfcc4cc5bc50..2141effcf015 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "44.4"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "uR9E6abAQz6W2ZfzlVhSBtq6xiRzmTo8B1Uv5YiOWo0="; + sha256 = "50YhKNLfIySh10gGLEBCnNBQSvCeQHBnsz86nQxZyOE="; }; nativeBuildInputs = [ @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]); platforms = platforms.unix; + mainProgram = "kgx"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix index 6873558830be..0c4d0b9d99a2 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; + mainProgram = "hyper"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix index 13f4e3c4119e..90483efc89a5 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests +, pcre2 }: stdenv.mkDerivation rec { pname = "lxterminal"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxterminal"; rev = version; - sha256 = "sha256-5J21Xvx43Ie01IxB2usyixDl+WZEeFHn2HXZsRS5imo="; + sha256 = "sha256-bCF/V6yFe4vKqVMOtNlwYyw/ickj1LFuFn4IyypwIg0="; }; configureFlags = [ @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; - buildInputs = [ gtk3 vte ]; + buildInputs = [ gtk3 vte pcre2 ]; patches = [ ./respect-xml-catalog-files-var.patch @@ -46,7 +47,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.lxde.org/en/LXTerminal"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.velovix ]; + maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.linux; + mainProgram = "lxterminal"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix index 890a70ac30b7..ef9f09a606fa 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; + mainProgram = "microcom"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix index 6ebd8f6f521d..0aeed26fb5be 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.27"; + version = "0.0.28"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-q3Wq7jIYE4g1uPAlpzNWvwUvMy9eN6NQNmPNC4cFmYg="; + hash = "sha256-OkJYGX/yWOUb4cDwacDgDRgzc/fkAnNcCzUrHimiVgM="; }; - cargoHash = "sha256-SP85se+H4jL/cXyvfbFS2lxpNSjuptAIPs3/htcrMcw="; + cargoHash = "sha256-vcIv3EGM8LEdg//FM/d+gDLLQFWukEE1/wfLVTXqN9w="; nativeBuildInputs = [ ncurses diff --git a/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix index 4d1ab91f83af..bbf435fd4ff7 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ astsmtl codyopel AndersonTorres ]; platforms = lib.platforms.linux; + mainProgram = "sakura"; }; }) diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix index 9856d1428f97..86b0657e0c03 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ andsild ]; platforms = platforms.unix; + mainProgram = "st"; }; }) diff --git a/nixpkgs/pkgs/applications/terminal-emulators/stupidterm/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/stupidterm/default.nix index 279af55254e0..f10d91229376 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; maintainers = [ maintainers.etu ]; platforms = platforms.linux; + mainProgram = "stupidterm"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix index 2b05ecdc7221..ab854a2f9906 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix @@ -76,5 +76,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/thestinger/termite/"; maintainers = with maintainers; [ koral ]; platforms = platforms.all; + mainProgram = "termite"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix index fb8d1b56d086..65da21cbabc7 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; maintainers = with maintainers; [ midchildan ]; platforms = platforms.linux; + mainProgram = "tilix"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix index d999bb5db297..acfbbb48943d 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ wesleyjrz kashw2 ]; platforms = platforms.linux; + mainProgram = "tym"; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix index ebc7657e8af3..f0c7203fd9ce 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/xtermcontrol/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.derchris ]; + mainProgram = "xtermcontrol"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/bcompare/default.nix b/nixpkgs/pkgs/applications/version-management/bcompare/default.nix index 9b7a4df091de..33b4cb0f90b5 100644 --- a/nixpkgs/pkgs/applications/version-management/bcompare/default.nix +++ b/nixpkgs/pkgs/applications/version-management/bcompare/default.nix @@ -90,6 +90,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ ktor arkivm ]; platforms = builtins.attrNames srcs; + mainProgram = "bcompare"; }; in if stdenv.isDarwin diff --git a/nixpkgs/pkgs/applications/version-management/bit/default.nix b/nixpkgs/pkgs/applications/version-management/bit/default.nix index 23d676e54eb5..a1242c43a9ca 100644 --- a/nixpkgs/pkgs/applications/version-management/bit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/bit/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://github.com/chriswalz/bit"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "bit"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/bumpver/default.nix b/nixpkgs/pkgs/applications/version-management/bumpver/default.nix index 3a1a51f83f8e..d540d4211073 100644 --- a/nixpkgs/pkgs/applications/version-management/bumpver/default.nix +++ b/nixpkgs/pkgs/applications/version-management/bumpver/default.nix @@ -30,5 +30,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://pypi.org/project/bumpver/"; license = licenses.mit; maintainers = with maintainers; [ kfollesdal ]; + mainProgram = "bumpver"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix b/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix index da16be94c33b..ae63280f7ee7 100644 --- a/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix +++ b/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix @@ -38,5 +38,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://codeberg.org/RobWalt/codeberg-cli"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ robwalt ]; + mainProgram = "berg"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/conform/default.nix b/nixpkgs/pkgs/applications/version-management/conform/default.nix index 4800a14b31ee..7ee825f566ec 100644 --- a/nixpkgs/pkgs/applications/version-management/conform/default.nix +++ b/nixpkgs/pkgs/applications/version-management/conform/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://github.com/siderolabs/conform"; license = licenses.mpl20; maintainers = with maintainers; [ jmgilman jk ]; + mainProgram = "conform"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/cvs/default.nix b/nixpkgs/pkgs/applications/version-management/cvs/default.nix index 4ee553c6c4be..20a38f9f8e8c 100644 --- a/nixpkgs/pkgs/applications/version-management/cvs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; - env = lib.optionalAttrs stdenv.cc.isClang { + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.cc.isClang) { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/nixpkgs/pkgs/applications/version-management/cvsps/default.nix b/nixpkgs/pkgs/applications/version-management/cvsps/default.nix index 7423726ac3ba..ebee69ebb3cd 100644 --- a/nixpkgs/pkgs/applications/version-management/cvsps/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvsps/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { homepage = "http://www.cobite.com/cvsps/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + mainProgram = "cvsps"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/danger-gitlab/default.nix b/nixpkgs/pkgs/applications/version-management/danger-gitlab/default.nix index e994739008d3..654ad2c82d56 100644 --- a/nixpkgs/pkgs/applications/version-management/danger-gitlab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/danger-gitlab/default.nix @@ -10,5 +10,6 @@ bundlerApp { homepage = "https://github.com/danger/danger-gitlab-gem"; license = licenses.mit; maintainers = teams.serokell.members; + mainProgram = "danger"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/darcs-to-git/default.nix b/nixpkgs/pkgs/applications/version-management/darcs-to-git/default.nix index 895e4610f4fc..14348921054b 100644 --- a/nixpkgs/pkgs/applications/version-management/darcs-to-git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/darcs-to-git/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation { homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; license = lib.licenses.mit; platforms = lib.platforms.unix; + mainProgram = "darcs-to-git"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/deepgit/default.nix b/nixpkgs/pkgs/applications/version-management/deepgit/default.nix index d9742a6a8f54..c430a02b24c6 100644 --- a/nixpkgs/pkgs/applications/version-management/deepgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/deepgit/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ urandom ]; platforms = platforms.linux; + mainProgram = "deepgit"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/degit/default.nix b/nixpkgs/pkgs/applications/version-management/degit/default.nix index af586da3496a..b126569c5991 100644 --- a/nixpkgs/pkgs/applications/version-management/degit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/degit/default.nix @@ -22,5 +22,6 @@ buildNpmPackage rec { homepage = "https://github.com/Rich-Harris/degit"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kidonng ]; + mainProgram = "degit"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix index 2cdae3989795..ef9b81f6d031 100644 --- a/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { diff-highlight to upgrade your diffs' appearances. ''; maintainers = with maintainers; [ fpletz ma27 ]; + mainProgram = "diff-so-fancy"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/fnc/default.nix b/nixpkgs/pkgs/applications/version-management/fnc/default.nix index 0b4205eb6055..31a71d5b8ad7 100644 --- a/nixpkgs/pkgs/applications/version-management/fnc/default.nix +++ b/nixpkgs/pkgs/applications/version-management/fnc/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ abbe ]; + mainProgram = "fnc"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/forgejo/default.nix b/nixpkgs/pkgs/applications/version-management/forgejo/default.nix index b10e9d432ce7..689167e3fbf8 100644 --- a/nixpkgs/pkgs/applications/version-management/forgejo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/forgejo/default.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-YZzVw+WWqTmJafqnZ5vrzb7P6V4DTMNQwW1/+wvZEM8="; + npmDepsHash = "sha256-7ruJczJ2cE51UmoER8C3JsGm0p3RTwfqKx0eErB7LZs="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.20.5-0"; + version = "1.21.1-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-tuwMvSWaMUc/GghmrbGLtyjixwOwiapWEOMD9QmMLic="; + hash = "sha256-e7Y1YBJq3PwYl7hf5KUa/CSI4ihbpN/TjWwltjNwXRM="; }; - vendorHash = "sha256-dgtZjsLBwblhdge3BvdbK/mN/TeZKps9K5dJbqomtjo="; + vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/version-management/fornalder/default.nix b/nixpkgs/pkgs/applications/version-management/fornalder/default.nix index 85f1ad6e6ba2..7d012c83606a 100644 --- a/nixpkgs/pkgs/applications/version-management/fornalder/default.nix +++ b/nixpkgs/pkgs/applications/version-management/fornalder/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hpjansson/fornalder"; license = licenses.gpl3Only; maintainers = with maintainers; [ astro figsoda ]; + mainProgram = "fornalder"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix index f5a8e8b25bb9..4ec89b050931 100644 --- a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-irzzG8qLJaBdRULGRyoYkn0tc4Yfcg/xe2SLriD8mtM="; + hash = "sha256-EfXnJ7oyXsnAajUPJTmBQE/lUCW8Xm/hF4+N6BvX6fQ="; }; buildCommand = '' diff --git a/nixpkgs/pkgs/applications/version-management/gex/default.nix b/nixpkgs/pkgs/applications/version-management/gex/default.nix index bb190a272b06..51a8839261af 100644 --- a/nixpkgs/pkgs/applications/version-management/gex/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gex/default.nix @@ -1,28 +1,35 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 +, Security }: rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-ADVF+Kb0DDiR3dS43uzhefFFEg1O8IC22i5fmziEp6I="; + hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_6 + libgit2 + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; - cargoHash = "sha256-XBBZ56jvBtYI5J/sSc4ckk/KXzCHNgM9A4jGolGKh2E="; + # force the libgit2-sys crate to use the system libgit2 library + LIBGIT2_NO_VENDOR = 1; + + cargoHash = "sha256-HNz1wwn0eUhNR6ZLLPMse8LmAS4CzADx0ZR9gJgJQCg="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; @@ -30,5 +37,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ azd325 evanrichter piturnah ]; + mainProgram = "gex"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gfold/default.nix b/nixpkgs/pkgs/applications/version-management/gfold/default.nix index cf254293987d..41aab380d555 100644 --- a/nixpkgs/pkgs/applications/version-management/gfold/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gfold/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage { license = licenses.asl20; maintainers = [ maintainers.shanesveller ]; platforms = platforms.unix; + mainProgram = "gfold"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gh/default.nix b/nixpkgs/pkgs/applications/version-management/gh/default.nix index cd3c6ce6dd13..622f5846f990 100644 --- a/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.39.1"; + version = "2.39.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-OvelaxyQNeh6h7wn4Z/vRicufOoxrTdmnWl9hKW00jU="; + hash = "sha256-6FjsUEroHpAjQj+7Z/C935LunYbgAzRvQI2pORiLo3s="; }; - vendorHash = "sha256-RFForZy/MktbrNrcpp9G6VCB7A98liJvCxS0Yb16sMc="; + vendorHash = "sha256-jM9nwTMOTh+eXztLvHIwwH4qu3ZIMOtBrPEtByB9Ry8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/version-management/ghorg/default.nix b/nixpkgs/pkgs/applications/version-management/ghorg/default.nix index ac534ff573a6..f76a0f77e54f 100644 --- a/nixpkgs/pkgs/applications/version-management/ghorg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/ghorg/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { homepage = "https://github.com/gabrie30/ghorg"; license = licenses.asl20; maintainers = with maintainers; [ vidbina ]; + mainProgram = "ghorg"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/ghq/default.nix b/nixpkgs/pkgs/applications/version-management/ghq/default.nix index 80704e49a208..17ac4a3b0894 100644 --- a/nixpkgs/pkgs/applications/version-management/ghq/default.nix +++ b/nixpkgs/pkgs/applications/version-management/ghq/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://github.com/x-motemen/ghq"; maintainers = with lib.maintainers; [ sigma ]; license = lib.licenses.mit; + mainProgram = "ghq"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/ghr/default.nix b/nixpkgs/pkgs/applications/version-management/ghr/default.nix index 7c786bb0b6b1..f7e6cadac0d3 100644 --- a/nixpkgs/pkgs/applications/version-management/ghr/default.nix +++ b/nixpkgs/pkgs/applications/version-management/ghr/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { description = "Upload multiple artifacts to GitHub Release in parallel"; license = licenses.mit; maintainers = [ maintainers.ivar ]; + mainProgram = "ghr"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix b/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix index 39e834168c32..b45df5d9a0f6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "tummychow"; - repo = pname; + repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-lFaiv9bgzu6XVcQuLXWoWsKl0cylfrF5rC0i3qj+zU0="; + hash = "sha256-SYBJKnzv2oktWubgm/j6wEeoLSBjGqQVXQf9LOaq+NU="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-hksSyVdsGe/Ha3F5orL4W/k2nzFCuMqQjBgsT1jiWLw="; + cargoHash = "sha256-i2ntM7NTi+hiB7DxEEV+3SXV8sVVWcNanif/wUZ9XvI="; postInstall = '' installManPage Documentation/git-absorb.1 @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; maintainers = [ maintainers.marsam ]; + mainProgram = "git-absorb"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-annex-remote-dbx/default.nix b/nixpkgs/pkgs/applications/version-management/git-annex-remote-dbx/default.nix index addfd1f5041b..ed4825011490 100644 --- a/nixpkgs/pkgs/applications/version-management/git-annex-remote-dbx/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-annex-remote-dbx/default.nix @@ -21,5 +21,6 @@ buildPythonApplication rec { description = "A git-annex special remote for Dropbox"; homepage = "https://pypi.org/project/git-annex-remote-dbx/"; license = licenses.mit; + mainProgram = "git-annex-remote-dbx"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/nixpkgs/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix index 16c5b49406f6..10eec961104d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix @@ -39,5 +39,6 @@ buildPythonApplication rec { homepage = "https://pypi.org/project/git-annex-remote-googledrive/"; license = licenses.gpl3Only; maintainers = with maintainers; [ gravndal ]; + mainProgram = "git-annex-remote-googledrive"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-annex-remote-rclone/default.nix b/nixpkgs/pkgs/applications/version-management/git-annex-remote-rclone/default.nix index e05bed928889..a38be753dfa9 100644 --- a/nixpkgs/pkgs/applications/version-management/git-annex-remote-rclone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-annex-remote-rclone/default.nix @@ -25,5 +25,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.all; maintainers = [ maintainers.montag451 ]; + mainProgram = "git-annex-remote-rclone"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix b/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix index 652c0be52117..cc77bf5aca65 100644 --- a/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/google/git-appraise"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester ]; + mainProgram = "git-appraise"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-archive-all/default.nix b/nixpkgs/pkgs/applications/version-management/git-archive-all/default.nix index 22f16692ec8e..f38e08ba8c8e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-archive-all/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-archive-all/default.nix @@ -58,5 +58,6 @@ buildPythonApplication rec { homepage = "https://github.com/Kentzo/git-archive-all"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; + mainProgram = "git-archive-all"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix b/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix index 0898ce089fc0..c63b2e6f3429 100644 --- a/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rixx/git-backdate"; license = licenses.wtfpl; maintainers = with maintainers; [ matthiasbeyer ]; + mainProgram = "git-backdate"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-backup/default.nix b/nixpkgs/pkgs/applications/version-management/git-backup/default.nix index dc21b61ed3e6..7f181fa006f8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-backup/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-backup/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { description = "A tool to help you backup your git repositories from services like GitHub"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + mainProgram = "git-backup"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-bars/default.nix b/nixpkgs/pkgs/applications/version-management/git-bars/default.nix index de396a0f7d01..d9acc9d46fb9 100644 --- a/nixpkgs/pkgs/applications/version-management/git-bars/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-bars/default.nix @@ -21,5 +21,6 @@ python3Packages.buildPythonApplication { description = "A utility for visualising git commit activity as bars on the terminal"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "git-bars"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-big-picture/default.nix b/nixpkgs/pkgs/applications/version-management/git-big-picture/default.nix index 959031fad9f9..a3ac58c04be8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-big-picture/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-big-picture/default.nix @@ -22,5 +22,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/git-big-picture/git-big-picture"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.nthorne ]; + mainProgram = "git-big-picture"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix b/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix index 386f405eb225..45e90c521f10 100644 --- a/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/MichaelMure/git-bug-migration"; license = licenses.gpl3Plus; maintainers = with maintainers; [ DeeUnderscore ]; + mainProgram = "git-bug-migration"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-bug/default.nix b/nixpkgs/pkgs/applications/version-management/git-bug/default.nix index 5a2e9e5eeca6..588ef81ced00 100644 --- a/nixpkgs/pkgs/applications/version-management/git-bug/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-bug/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { homepage = "https://github.com/MichaelMure/git-bug"; license = licenses.gpl3Plus; maintainers = with maintainers; [ royneary DeeUnderscore ]; + mainProgram = "git-bug"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-cache/default.nix b/nixpkgs/pkgs/applications/version-management/git-cache/default.nix new file mode 100644 index 000000000000..147570c7afd1 --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-cache/default.nix @@ -0,0 +1,27 @@ +{fetchFromGitHub, lib, stdenv}: + +stdenv.mkDerivation { + pname = "git-cache"; + version = "2018-06-18"; + + src = fetchFromGitHub { + owner = "Seb35"; + repo = "git-cache"; + rev = "354f661e40b358c5916c06957bd6b2c65426f452"; + hash = "sha256-V7rQOy+s9Lzdc+RTA2QGPfyavw4De/qQ+tWrzYtO2qA="; + }; + + dontBuild = true; + + installPhase = '' + install -Dm555 git-cache $out/bin/git-cache + ''; + + meta = with lib; { + homepage = "https://github.com/Seb35/git-cache"; + license = licenses.wtfpl; + description = "A program to add and manage a system-wide or user-wide cache for remote git repositories"; + platforms = platforms.unix; + maintainers = with maintainers; [ maxhearnden ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/git-chglog/default.nix b/nixpkgs/pkgs/applications/version-management/git-chglog/default.nix index ad0d64a6ef62..eccc508fc257 100644 --- a/nixpkgs/pkgs/applications/version-management/git-chglog/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-chglog/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/git-chglog/git-chglog"; license = licenses.mit; maintainers = with maintainers; [ ldenefle ]; + mainProgram = "git-chglog"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-codeowners/default.nix b/nixpkgs/pkgs/applications/version-management/git-codeowners/default.nix index 862461827eb1..90e0482675ae 100644 --- a/nixpkgs/pkgs/applications/version-management/git-codeowners/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-codeowners/default.nix @@ -17,5 +17,6 @@ rustPlatform.buildRustPackage rec { description = "a git extension to work with CODEOWNERS files"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; + mainProgram = "git-codeowners"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix b/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix index 4cd4c68673a7..b8ddc56e88c6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://golang.org/x/review/git-codereview"; license = licenses.bsd3; maintainers = [ maintainers.edef ]; + mainProgram = "git-codereview"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-cola/default.nix b/nixpkgs/pkgs/applications/version-management/git-cola/default.nix index 3985c1925718..56a89f7eec81 100644 --- a/nixpkgs/pkgs/applications/version-management/git-cola/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-cola/default.nix @@ -1,19 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ stdenv, lib, fetchFromGitHub, python3Packages, gettext, git, qt5, gitUpdater }: python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.2.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; - rev = "refs/tags/v${version}"; - hash = "sha256-VAn4zXypOugPIVyXQ/8Yt0rCDM7hVdIY+jpmoTHqssU="; + rev = "v${version}"; + hash = "sha256-PtV2mzxOfZ88THiFD4K+qtOi41GeLF1GcdiFFhUR8Ak="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + buildInputs = lib.optionals stdenv.isLinux [ qt5.qtwayland ]; propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ]; - nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ]; + nativeBuildInputs = with python3Packages; [ setuptools-scm gettext qt5.wrapQtAppsHook ]; nativeCheckInputs = with python3Packages; [ git pytestCheckHook ]; disabledTestPaths = [ @@ -27,6 +29,10 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; diff --git a/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix index 1ad75e75b7bf..5ea10a13c418 100644 --- a/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix @@ -21,5 +21,6 @@ python3.pkgs.buildPythonApplication rec { description = "Git subcommand to interactively select changes to commit or stage"; license = licenses.gpl2Plus; maintainers = with maintainers; [ onny ]; + mainProgram = "git-crecord"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-credential-1password/default.nix b/nixpkgs/pkgs/applications/version-management/git-credential-1password/default.nix index 65afd5f1c387..832698718c3d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-credential-1password/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-credential-1password/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { changelog = "https://github.com/develerik/git-credential-1password/releases/tag/v${version}"; license = licenses.isc; maintainers = [ maintainers.ivankovnatsky ]; + mainProgram = "git-credential-1password"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 20183c5fada3..2d3e511fcbfd 100644 --- a/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Frederick888/git-credential-keepassxc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; + mainProgram = "git-credential-keepassxc"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix b/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix index 962bf18b366b..54de6b1bcf3a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix @@ -63,5 +63,6 @@ buildDotnetModule rec { .NET can find `/usr/bin/codesign` to sign the compiled binary. This problem is common to all .NET packages on MacOS with Nix. ''; + mainProgram = "git-credential-manager"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix b/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix index 9b46a0c501b1..d04faab2a65c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { changelog = "https://github.com/hickford/git-credential-oauth/releases/tag/${src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ shyim ]; + mainProgram = "git-credential-oauth"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix index c2f4b4a27030..2355f48bcb77 100644 --- a/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; + mainProgram = "git-crypt"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-dive/default.nix b/nixpkgs/pkgs/applications/version-management/git-dive/default.nix index a843b5243352..983d7b3dd672 100644 --- a/nixpkgs/pkgs/applications/version-management/git-dive/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-dive/default.nix @@ -62,5 +62,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/gitext-rs/git-dive/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "git-dive"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-fame/default.nix b/nixpkgs/pkgs/applications/version-management/git-fame/default.nix index 4dc9c4f8453d..d69988eca012 100644 --- a/nixpkgs/pkgs/applications/version-management/git-fame/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-fame/default.nix @@ -17,5 +17,6 @@ bundlerEnv { license = licenses.mit; maintainers = with maintainers; [ expipiplus1 nicknovitski ]; platforms = platforms.unix; + mainProgram = "git-fame"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-ftp/default.nix b/nixpkgs/pkgs/applications/version-management/git-ftp/default.nix index 57b5e3c46372..a3087249cadd 100644 --- a/nixpkgs/pkgs/applications/version-management/git-ftp/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-ftp/default.nix @@ -95,5 +95,6 @@ resholve.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ tweber ]; platforms = platforms.unix; + mainProgram = "git-ftp"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-gone/default.nix b/nixpkgs/pkgs/applications/version-management/git-gone/default.nix index dc80052fe62a..559c81dd48c6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-gone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-gone/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; + mainProgram = "git-gone"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-graph/default.nix b/nixpkgs/pkgs/applications/version-management/git-graph/default.nix index 93db500f0a26..016892892247 100644 --- a/nixpkgs/pkgs/applications/version-management/git-graph/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-graph/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; broken = stdenv.isDarwin; maintainers = with maintainers; [ cafkafk ]; + mainProgram = "git-graph"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-hub/default.nix index 279ae81b1010..907721f882b3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-hub/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.all; + mainProgram = "git-hub"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix b/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix index b6b8b6f94134..ca931ac2786d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sondr3/git-ignore/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ figsoda ]; + mainProgram = "git-ignore"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-imerge/default.nix b/nixpkgs/pkgs/applications/version-management/git-imerge/default.nix index 592f61db8e08..66e141ef85ff 100644 --- a/nixpkgs/pkgs/applications/version-management/git-imerge/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-imerge/default.nix @@ -20,5 +20,6 @@ buildPythonApplication rec { description = "Perform a merge between two branches incrementally"; license = licenses.gpl2Plus; maintainers = [ ]; + mainProgram = "git-imerge"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index ed36f2092716..54ce30907323 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -55,5 +55,6 @@ buildGoModule rec { changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ twey marsam ]; + mainProgram = "git-lfs"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/nixpkgs/pkgs/applications/version-management/git-machete/default.nix index a4d1ffb090f0..a1f45d65db35 100644 --- a/nixpkgs/pkgs/applications/version-management/git-machete/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.9"; + version = "3.20.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-oU4c57XU/DLGjOl/CyCt6oG3QaB2xnrOEg+sUAd7sww="; + hash = "sha256-6TntyAkDIcCVcAsNdAlgvKYO7Db0oMDWKW92rMRIDI4="; }; nativeBuildInputs = [ installShellFiles ]; @@ -29,6 +29,12 @@ buildPythonApplication rec { pytestCheckHook ]; + disabledTests = [ + # Requires fully functioning shells including zsh modules and bash + # completion. + "completion_e2e" + ]; + postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh @@ -49,5 +55,6 @@ buildPythonApplication rec { changelog = "https://github.com/VirtusLab/git-machete/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ blitz ]; + mainProgram = "git-machete"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index bcaf37cdcb34..68b3fc6cd467 100644 --- a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.175"; + version = "5.12.178"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-c026r3F/oNk/DyEwHb/1kSL99bqmYp7mqOdsWbB7Njo="; + hash = "sha256-PyQhg3JJqfOVjT72kvfki4krLB3YRP9EHqbIptRI9nc="; }; - cargoHash = "sha256-QpmgGonDy3Pkx2i5X3ZxmBXqupOoESoFMIBorFeqam4="; + cargoHash = "sha256-/8zrqj3Nlm84eAYfMzpZJ9Bgv5Tjyucfv9YcXdGXXFQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-my/default.nix b/nixpkgs/pkgs/applications/version-management/git-my/default.nix index d8ce7a42bb59..2683af402287 100644 --- a/nixpkgs/pkgs/applications/version-management/git-my/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-my/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { license = licenses.free; maintainers = with maintainers; [ bb010g ]; platforms = platforms.all; + mainProgram = "git-my"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix b/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix index e1c55676da09..941b84b68fcc 100644 --- a/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ rraval ]; + mainProgram = "git-nomad"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-open/default.nix b/nixpkgs/pkgs/applications/version-management/git-open/default.nix index 42e23dcd32e3..29975c5b68d0 100644 --- a/nixpkgs/pkgs/applications/version-management/git-open/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-open/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "git-open"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix b/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix index 0fe486dbc2d1..3d3d7521f28d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix @@ -43,5 +43,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "git-privacy"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-publish/default.nix b/nixpkgs/pkgs/applications/version-management/git-publish/default.nix index 0f0eeff156b0..94949396ee9f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-publish/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-publish/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.lheckemann ]; homepage = "https://github.com/stefanha/git-publish"; + mainProgram = "git-publish"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix b/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix index 5a3a41e05b05..feb4bcafc1b4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.kmein ]; license = licenses.mit; + mainProgram = "git-quick-stats"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix b/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix index 4b4319f8cd7c..a85bbbc54f5d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ msfjarvis ]; + mainProgram = "git-quickfix"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-radar/default.nix b/nixpkgs/pkgs/applications/version-management/git-radar/default.nix index 1cd14aa96927..27979d63cca5 100644 --- a/nixpkgs/pkgs/applications/version-management/git-radar/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-radar/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "A tool you can add to your prompt to provide at-a-glance information on your git repo"; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ kamilchm ]; + mainProgram = "git-radar"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-recent/default.nix b/nixpkgs/pkgs/applications/version-management/git-recent/default.nix index 1a1811b2f438..52b4a49d19b9 100644 --- a/nixpkgs/pkgs/applications/version-management/git-recent/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-recent/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.jlesquembre ]; + mainProgram = "git-recent"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-relevant-history/default.nix b/nixpkgs/pkgs/applications/version-management/git-relevant-history/default.nix index c4cb223d253b..063aa3215705 100644 --- a/nixpkgs/pkgs/applications/version-management/git-relevant-history/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-relevant-history/default.nix @@ -20,5 +20,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.bendlas ]; + mainProgram = "git-relevant-history"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-remote-codecommit/default.nix b/nixpkgs/pkgs/applications/version-management/git-remote-codecommit/default.nix index f2b47af2e382..fc9bd9ee02ed 100644 --- a/nixpkgs/pkgs/applications/version-management/git-remote-codecommit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-remote-codecommit/default.nix @@ -35,5 +35,6 @@ buildPythonApplication rec { maintainers = [ lib.maintainers.zaninime ]; homepage = "https://github.com/awslabs/git-remote-codecommit"; license = lib.licenses.asl20; + mainProgram = "git-remote-codecommit"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-remote-gcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-remote-gcrypt/default.nix index 8f3155ce0546..fd506ca2b46b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-remote-gcrypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-remote-gcrypt/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ ellis montag451 ]; platforms = platforms.unix; + mainProgram = "git-remote-gcrypt"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix b/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix index ec1c44b96134..df42e3b18779 100644 --- a/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.marsam ]; license = licenses.gpl2; platforms = platforms.unix; + mainProgram = "git-reparent"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-repo-updater/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo-updater/default.nix index ebea57c1552a..5c215644463c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo-updater/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo-updater/default.nix @@ -27,5 +27,6 @@ buildPythonApplication rec { homepage = "https://github.com/earwig/git-repo-updater"; license = licenses.mit; maintainers = with maintainers; [bdesham ]; + mainProgram = "gitup"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index edf05ff03f81..e989e03ca1cf 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ otavio ]; platforms = platforms.unix; + mainProgram = "repo"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-review/default.nix b/nixpkgs/pkgs/applications/version-management/git-review/default.nix index 2650f330c0a9..e32d89c042ca 100644 --- a/nixpkgs/pkgs/applications/version-management/git-review/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-review/default.nix @@ -48,5 +48,6 @@ buildPythonApplication rec { homepage = "https://opendev.org/opendev/git-review"; license = licenses.asl20; maintainers = with maintainers; [ kira-bruneau ]; + mainProgram = "git-review"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-secret/default.nix b/nixpkgs/pkgs/applications/version-management/git-secret/default.nix index 6293af4642a3..877a727523b5 100644 --- a/nixpkgs/pkgs/applications/version-management/git-secret/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-secret/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.lo1tuma ]; platforms = lib.platforms.all; + mainProgram = "git-secret"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-secrets/default.nix b/nixpkgs/pkgs/applications/version-management/git-secrets/default.nix index 154a4048e0a7..a2f2045a3ddc 100644 --- a/nixpkgs/pkgs/applications/version-management/git-secrets/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-secrets/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/awslabs/git-secrets"; license = licenses.asl20; platforms = platforms.all; + mainProgram = "git-secrets"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-series/default.nix b/nixpkgs/pkgs/applications/version-management/git-series/default.nix index 2e173dd41be9..a055ccc868f2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-series/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-series/default.nix @@ -63,5 +63,6 @@ rustPlatform.buildRustPackage { license = licenses.mit; maintainers = with maintainers; [ edef vmandela ]; + mainProgram = "git-series"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix b/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix index 277786d72420..b3d7f7a3a432 100644 --- a/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/github/git-sizer"; license = licenses.mit; maintainers = with maintainers; [ matthewbauer ]; + mainProgram = "git-sizer"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-stack/default.nix b/nixpkgs/pkgs/applications/version-management/git-stack/default.nix index fe81f0b41ef0..d9792654a94b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-stack/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-stack/default.nix @@ -37,5 +37,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/gitext-rs/git-stack/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ stehessel ]; + mainProgram = "git-stack"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-standup/default.nix b/nixpkgs/pkgs/applications/version-management/git-standup/default.nix index 2bbf7840138d..0fcdd265a0c3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-standup/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-standup/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.marsam ]; platforms = platforms.all; + mainProgram = "git-standup"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-stree/default.nix b/nixpkgs/pkgs/applications/version-management/git-stree/default.nix index aa53529933ff..53f43d69d4d4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-stree/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-stree/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = licenses.mit; maintainers = [ maintainers.benley ]; platforms = platforms.unix; + mainProgram = "git-stree"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix b/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix index c10a27102490..547adee7d6a3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/apenwarr/git-subtrac"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; + mainProgram = "git-subtrac"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-team/default.nix b/nixpkgs/pkgs/applications/version-management/git-team/default.nix index afce41e15d19..19556366b1eb 100644 --- a/nixpkgs/pkgs/applications/version-management/git-team/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-team/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { homepage = "https://github.com/hekmekk/git-team"; license = licenses.mit; maintainers = with maintainers; [ lockejan ]; + mainProgram = "git-team"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-test/default.nix b/nixpkgs/pkgs/applications/version-management/git-test/default.nix index 624ce5616909..2f56091e2ad6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-test/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-test/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; platforms = platforms.all; + mainProgram = "git-test"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-town/default.nix b/nixpkgs/pkgs/applications/version-management/git-town/default.nix index bc5f7f3b0854..661abe06f73e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-town/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-town/default.nix @@ -64,5 +64,6 @@ buildGoModule rec { homepage = "https://www.git-town.com/"; license = licenses.mit; maintainers = with maintainers; [ allonsy blaggacao ]; + mainProgram = "git-town"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-trim/default.nix b/nixpkgs/pkgs/applications/version-management/git-trim/default.nix index 7e90b6e38035..cbc96ed1e78c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-trim/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-trim/default.nix @@ -51,5 +51,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/foriequal0/git-trim"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + mainProgram = "git-trim"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-up/default.nix b/nixpkgs/pkgs/applications/version-management/git-up/default.nix index 7c0e6d53db0a..851cb8464c5b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-up/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-up/default.nix @@ -52,5 +52,6 @@ pythonPackages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + mainProgram = "git-up"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix b/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix index 48fee5c578ed..915ef38307b2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { description = "Tool for creating commit hashes with a specific prefix"; license = [ licenses.mit ]; maintainers = [ maintainers.kaction ]; + mainProgram = "git-vanity-hash"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-vendor/default.nix b/nixpkgs/pkgs/applications/version-management/git-vendor/default.nix index 9d72cc18b94f..6722f94d503e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-vendor/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-vendor/default.nix @@ -61,6 +61,7 @@ in stdenv.mkDerivation { license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; + mainProgram = "git-vendor"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix b/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix index 00c9bfa0ae4a..36336d964cc3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = python3.meta.platforms; maintainers = with maintainers; [ DamienCassou ]; + mainProgram = "git-when-merged"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix b/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix index 7ceb970737c3..fc16e778f28c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/orf/git-workspace"; license = with licenses; [ mit ]; maintainers = with maintainers; [ misuzu ]; + mainProgram = "git-workspace"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git2cl/default.nix b/nixpkgs/pkgs/applications/version-management/git2cl/default.nix index b68179b182bc..cddc6eb7e2fe 100644 --- a/nixpkgs/pkgs/applications/version-management/git2cl/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git2cl/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://savannah.nongnu.org/projects/git2cl"; description = "Convert git logs to GNU style ChangeLog files"; platforms = lib.platforms.unix; + mainProgram = "git2cl"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gita/default.nix b/nixpkgs/pkgs/applications/version-management/gita/default.nix index 257ace5013e2..eba9f5ed7525 100644 --- a/nixpkgs/pkgs/applications/version-management/gita/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gita/default.nix @@ -39,5 +39,6 @@ buildPythonApplication rec { homepage = "https://github.com/nosarthur/gita"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; + mainProgram = "gita"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix b/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix index cb19964f733b..c880b9343f1a 100644 --- a/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ teto ]; platforms = with platforms; linux; + mainProgram = "gitbatch"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix b/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix index 33233fe9cf86..8c79258fd3ff 100644 --- a/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix +++ b/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix @@ -79,5 +79,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dan4ik605743 ]; platforms = lib.platforms.linux; + mainProgram = "github-desktop"; }; }) diff --git a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 9082bffce0f9..a58ea68fe2b6 100644 --- a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -40,6 +40,7 @@ let license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ xnwdd evanjs arkivm ]; + mainProgram = "gitkraken"; }; linux = stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix index 34fb6f73c64e..5397688ebf1f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix @@ -12,5 +12,6 @@ bundlerApp { homepage = "https://gitlab.com/gitlab-org/gitlab-triage"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "gitlab-triage"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index c3e715ad46fe..4330a8f56971 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv -, ruby_3_2, tzdata, git, nettools, nixosTests, nodejs, openssl +, ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn -, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config +, prefetch-yarn-deps, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: let @@ -17,7 +17,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - ruby = ruby_3_2; + ruby = ruby_3_1; gemdir = ./rubyEnv; gemset = let x = import (gemdir + "/gemset.nix") src; @@ -53,7 +53,7 @@ let sha256 = data.yarn_hash; }; - nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert prefetch-yarn-deps ]; patches = [ # Since version 12.6.0, the rake tasks need the location of git, @@ -88,7 +88,7 @@ let yarn config --offline set yarn-offline-mirror $yarnOfflineCache # Fixup "resolved"-entries in yarn.lock to match our offline cache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive diff --git a/nixpkgs/pkgs/applications/version-management/gitless/default.nix b/nixpkgs/pkgs/applications/version-management/gitless/default.nix index 0f6a59ac641e..8bbb0eee971d 100644 --- a/nixpkgs/pkgs/applications/version-management/gitless/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitless/default.nix @@ -36,5 +36,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ cransom ]; platforms = platforms.all; + mainProgram = "gl"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitlint/default.nix b/nixpkgs/pkgs/applications/version-management/gitlint/default.nix index 575cf96826d4..37783a92ab3e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlint/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlint/default.nix @@ -49,5 +49,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/jorisroovers/gitlint/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 fab ]; + mainProgram = "gitlint"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitls/default.nix b/nixpkgs/pkgs/applications/version-management/gitls/default.nix index 28fbba659f42..16ae8c9e6a8b 100644 --- a/nixpkgs/pkgs/applications/version-management/gitls/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitls/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { changelog = "https://github.com/hahwul/gitls/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "gitls"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitmux/default.nix b/nixpkgs/pkgs/applications/version-management/gitmux/default.nix index be565f4fda44..667a204f8447 100644 --- a/nixpkgs/pkgs/applications/version-management/gitmux/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitmux/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/arl/gitmux"; license = licenses.mit; maintainers = with maintainers; [ nialov ]; + mainProgram = "gitmux"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix b/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix index db79637ef9ff..e265f56aea85 100644 --- a/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ zendo ]; + mainProgram = "gitnuro"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix b/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix index 6980c8f22576..6d0013f5ad51 100644 --- a/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/9ary/gitprompt-rs"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ novenary ]; + mainProgram = "gitprompt-rs"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix b/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix index d7c1e46577e5..2c1ccb76dd73 100644 --- a/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix @@ -82,5 +82,6 @@ mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; + mainProgram = "gitqlient"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitstats/default.nix b/nixpkgs/pkgs/applications/version-management/gitstats/default.nix index a795f0f6f6dd..25fcd7247c22 100644 --- a/nixpkgs/pkgs/applications/version-management/gitstats/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitstats/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "gitstats"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix index 21e8bafcd0b3..ccb1f07edeca 100644 --- a/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ mmlb hexa SuperSandro2000 ]; platforms = platforms.all; + mainProgram = "gitstatusd"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitty/default.nix b/nixpkgs/pkgs/applications/version-management/gitty/default.nix index 0bc267d9647c..ba677b2ba8e5 100644 --- a/nixpkgs/pkgs/applications/version-management/gitty/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitty/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Contextual information about your git projects, right on the command-line"; license = licenses.mit; maintainers = with maintainers; [ izorkin ]; + mainProgram = "gitty"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/glab/default.nix b/nixpkgs/pkgs/applications/version-management/glab/default.nix index f4e1815e278e..781eeae33231 100644 --- a/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -43,5 +43,6 @@ buildGoModule rec { homepage = "https://gitlab.com/gitlab-org/cli"; changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${version}"; maintainers = with maintainers; [ freezeboy ]; + mainProgram = "glab"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/glitter/default.nix b/nixpkgs/pkgs/applications/version-management/glitter/default.nix index c99403889d54..ddd56fdfb11c 100644 --- a/nixpkgs/pkgs/applications/version-management/glitter/default.nix +++ b/nixpkgs/pkgs/applications/version-management/glitter/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "glitter"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/nixpkgs/pkgs/applications/version-management/gogs/default.nix index 2a7d70cdc1b7..e0f20d1467f6 100644 --- a/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -44,5 +44,6 @@ buildGoModule rec { homepage = "https://gogs.io"; license = licenses.mit; maintainers = [ maintainers.schneefux ]; + mainProgram = "gogs"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gomp/default.nix b/nixpkgs/pkgs/applications/version-management/gomp/default.nix index 3f60ba8b7acf..03385404e787 100644 --- a/nixpkgs/pkgs/applications/version-management/gomp/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gomp/default.nix @@ -20,5 +20,6 @@ python3Packages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ prusnak ]; platforms = platforms.unix; + mainProgram = "gomp"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gource/default.nix b/nixpkgs/pkgs/applications/version-management/gource/default.nix index d0175251e6ec..63c2202b4be9 100644 --- a/nixpkgs/pkgs/applications/version-management/gource/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gource/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; + mainProgram = "gource"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gql/default.nix b/nixpkgs/pkgs/applications/version-management/gql/default.nix index 60a093e1c80b..02a90ab2ec7c 100644 --- a/nixpkgs/pkgs/applications/version-management/gql/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-+f/OMU8fwwnlm8zTyE5XyIzfFwIB917tH9jaqSW8Skg="; + hash = "sha256-A9gjCuWIRdNQhMjdRIH0B5cXGZAPQxK+qYSNI5WGZec="; }; - cargoHash = "sha256-A3o9OE8VO7z04WmbZL2rvlZRN/ZHOIGklKZQgiFSfxE="; + cargoHash = "sha256-aA7YPUKlBhfIBvT4D6zgZ8+lKNNazsVwGJC5VETAzOY="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/applications/version-management/gst/default.nix b/nixpkgs/pkgs/applications/version-management/gst/default.nix index bf7abf12d7bf..c282da41c1eb 100644 --- a/nixpkgs/pkgs/applications/version-management/gst/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gst/default.nix @@ -52,5 +52,6 @@ buildGoModule rec { homepage = "https://github.com/uetchy/gst"; maintainers = with lib.maintainers; [ _0x4A6F ]; license = lib.licenses.asl20; + mainProgram = "gst"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/guilt/default.nix b/nixpkgs/pkgs/applications/version-management/guilt/default.nix index 664db771e93f..aeb0eaf43f11 100644 --- a/nixpkgs/pkgs/applications/version-management/guilt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/guilt/default.nix @@ -88,5 +88,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ javimerino ]; license = [ licenses.gpl2 ]; platforms = platforms.all; + mainProgram = "guilt"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gut/default.nix b/nixpkgs/pkgs/applications/version-management/gut/default.nix index 92457cdbf4c3..3d57ceb03a80 100644 --- a/nixpkgs/pkgs/applications/version-management/gut/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gut/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://gut-cli.dev"; license = licenses.mit; maintainers = with maintainers; [ paveloom ]; + mainProgram = "gut"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/hut/default.nix b/nixpkgs/pkgs/applications/version-management/hut/default.nix index ef188ba68d95..931f85fd45f0 100644 --- a/nixpkgs/pkgs/applications/version-management/hut/default.nix +++ b/nixpkgs/pkgs/applications/version-management/hut/default.nix @@ -36,5 +36,6 @@ buildGoModule rec { description = "A CLI tool for Sourcehut / sr.ht"; license = licenses.agpl3Only; maintainers = with maintainers; [ fgaz ]; + mainProgram = "hut"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/lab/default.nix b/nixpkgs/pkgs/applications/version-management/lab/default.nix index 6bbe405f65c1..d75a1cba6142 100644 --- a/nixpkgs/pkgs/applications/version-management/lab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/lab/default.nix @@ -37,5 +37,6 @@ buildGoModule rec { homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; maintainers = with maintainers; [ marsam dtzWill ]; + mainProgram = "lab"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/lefthook/default.nix b/nixpkgs/pkgs/applications/version-management/lefthook/default.nix deleted file mode 100644 index 62ea51f5e73e..000000000000 --- a/nixpkgs/pkgs/applications/version-management/lefthook/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -let - pname = "lefthook"; - version = "1.5.2"; -in -buildGoModule rec { - inherit pname version; - - src = fetchFromGitHub { - owner = "evilmartians"; - repo = "lefthook"; - rev = "v${version}"; - hash = "sha256-9lAgKHcUAhg3Z8fMNYu3JrjfSd0HaT7YhvjKlpLMi0E="; - }; - - vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" ]; - - doCheck = false; - - postInstall = '' - installShellCompletion --cmd lefthook \ - --bash <($out/bin/lefthook completion bash) \ - --fish <($out/bin/lefthook completion fish) \ - --zsh <($out/bin/lefthook completion zsh) - ''; - - meta = { - description = "Fast and powerful Git hooks manager for any type of projects"; - homepage = "https://github.com/evilmartians/lefthook"; - changelog = "https://github.com/evilmartians/lefthook/raw/v${version}/CHANGELOG.md"; - license = lib.licenses.mit; - mainProgram = "lefthook"; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/nixpkgs/pkgs/applications/version-management/legit-web/default.nix b/nixpkgs/pkgs/applications/version-management/legit-web/default.nix index 72de9d90c3e8..a14b7c22bd4b 100644 --- a/nixpkgs/pkgs/applications/version-management/legit-web/default.nix +++ b/nixpkgs/pkgs/applications/version-management/legit-web/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://github.com/icyphox/legit"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ratsclub ]; + mainProgram = "legit"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/legit/default.nix b/nixpkgs/pkgs/applications/version-management/legit/default.nix index fd2875b13be2..c42f6eecfeea 100644 --- a/nixpkgs/pkgs/applications/version-management/legit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/legit/default.nix @@ -28,5 +28,6 @@ python3Packages.buildPythonApplication rec { description = "Git for Humans, Inspired by GitHub for Mac"; license = licenses.bsd3; maintainers = with maintainers; [ ryneeverett ]; + mainProgram = "legit"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix b/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix index a484aa6c3290..4e8db1fef606 100644 --- a/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/lucky-commit/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0RSNlzmwat89ewQrjdGxLcXo01d+UaPZlteaxZCBRyE="; + sha256 = "sha256-DrgZBzcJmqSP7iCHZyy623iRZYfTE/z/zzx7I+BAOBo="; }; - cargoSha256 = "sha256-8r/EGIiN+HTtChgLTdOS+Y7AdmjswqD4BZtYlL5UiEo="; + cargoHash = "sha256-5P0CiLCf86Jul4EaIDqHGkp4XNifLKnWJZXtrLkpLMY="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/nixpkgs/pkgs/applications/version-management/meld/default.nix b/nixpkgs/pkgs/applications/version-management/meld/default.nix index fc8ec7b55d1f..e43448fd2f1d 100644 --- a/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -69,5 +69,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ jtojnar mimame ]; + mainProgram = "meld"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 01dc3efcd6e0..29dbe0573422 100644 --- a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -94,6 +94,7 @@ let license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lukegb pacien techknowlogick ]; platforms = platforms.unix; + mainProgram = "hg"; }; }; diff --git a/nixpkgs/pkgs/applications/version-management/merge-fmt/default.nix b/nixpkgs/pkgs/applications/version-management/merge-fmt/default.nix index 2f1ec571b162..6a9a18aa992f 100644 --- a/nixpkgs/pkgs/applications/version-management/merge-fmt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/merge-fmt/default.nix @@ -24,5 +24,6 @@ buildDunePackage rec { conflicts by leveraging code formatters. ''; maintainers = [ maintainers.alizter ]; + mainProgram = "merge-fmt"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/mr/default.nix b/nixpkgs/pkgs/applications/version-management/mr/default.nix index da882f1e359f..4ff6c6733e6f 100644 --- a/nixpkgs/pkgs/applications/version-management/mr/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mr/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { homepage = "http://myrepos.branchable.com/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ antono henrytill ]; + maintainers = with lib.maintainers; [ antono ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix index 027bba16e86c..854c66a6d5e4 100644 --- a/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix +++ b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix @@ -46,5 +46,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/kynan/nbstripout"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; + mainProgram = "nbstripout"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix b/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix index 7085e0c48f25..cc34a67c04b5 100644 --- a/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix @@ -22,5 +22,6 @@ buildPythonApplication rec { description = "A git credential helper interfacing with pass, the standard unix password manager"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hmenke vanzef ]; + mainProgram = "pass-git-helper"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/peru/default.nix b/nixpkgs/pkgs/applications/version-management/peru/default.nix index b7b6d62e4b4c..5637471711b1 100644 --- a/nixpkgs/pkgs/applications/version-management/peru/default.nix +++ b/nixpkgs/pkgs/applications/version-management/peru/default.nix @@ -23,6 +23,7 @@ python3Packages.buildPythonApplication rec { description = "A tool for including other people's code in your projects"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "peru"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 63f7bf7fbbe2..4c35e2706ed1 100644 --- a/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ gal_bolle dywedir fabianhjr ]; + mainProgram = "pijul"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/qgit/default.nix b/nixpkgs/pkgs/applications/version-management/qgit/default.nix index 85cb9127c21e..a0038554d86c 100644 --- a/nixpkgs/pkgs/applications/version-management/qgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/qgit/default.nix @@ -21,5 +21,6 @@ mkDerivation rec { description = "Graphical front-end to Git"; maintainers = with maintainers; [ peterhoeg markuskowa ]; inherit (qtbase.meta) platforms; + mainProgram = "qgit"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix b/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix index 7c2972538e9e..53df3af4a79d 100644 --- a/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix +++ b/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.viric ]; platforms = lib.platforms.unix; + mainProgram = "rapidsvn"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/rcshist/default.nix b/nixpkgs/pkgs/applications/version-management/rcshist/default.nix index f7cdceaa1b4c..f11c515b5399 100644 --- a/nixpkgs/pkgs/applications/version-management/rcshist/default.nix +++ b/nixpkgs/pkgs/applications/version-management/rcshist/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.kaction ]; platforms = lib.platforms.unix; + mainProgram = "rcshist"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile index a00b360e6e04..326f0e0bab0b 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '6.1.7.2' +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' @@ -13,10 +13,16 @@ gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : gem 'marcel' gem "mail", "~> 2.7.1" gem 'csv', '~> 3.2.0' -gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10') -gem "rexml" +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.0' +gem 'rbpdf', '~> 1.21.3' gem 'addressable' gem 'rubyzip', '~> 2.3.0' gem 'net-smtp', '~> 0.3.0' @@ -70,9 +76,10 @@ end group :test do gem "rails-dom-testing" - gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0') + 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' diff --git a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock index 746d455c3d65..f9efc5ecede6 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,28 +1,28 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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.2) - actionpack (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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.2) - actionview (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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) @@ -30,40 +30,40 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.1.7.2) - actionpack (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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.2) - activesupport (= 6.1.7.2) + 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.2) - activesupport (= 6.1.7.2) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (6.1.7.2) - activesupport (= 6.1.7.2) - activerecord (6.1.7.2) - activemodel (= 6.1.7.2) - activesupport (= 6.1.7.2) - activestorage (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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.2) + 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.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) builder (3.2.4) @@ -78,20 +78,20 @@ GEM xpath (~> 3.2) childprocess (3.0.0) chunky_png (1.4.0) - commonmarker (0.23.9) + commonmarker (0.23.10) concurrent-ruby (1.2.2) crass (1.0.6) - css_parser (1.14.0) + css_parser (1.16.0) addressable - csv (3.2.6) + 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.15.5) - globalid (1.1.0) - activesupport (>= 5.0) + ffi (1.16.3) + globalid (1.2.1) + activesupport (>= 6.1) html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) @@ -101,7 +101,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.7.1) @@ -110,10 +110,10 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_magick (4.11.0) - mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.18.1) - mocha (2.0.4) + 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) @@ -123,75 +123,75 @@ GEM net-ldap (0.17.1) net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.9) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - nokogiri (1.13.10-x86_64-linux) + nio4r (2.6.1) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.4.6) - public_suffix (5.0.1) - puma (6.3.0) + public_suffix (5.0.4) + puma (6.4.0) nio4r (~> 2.0) - racc (1.7.1) - rack (2.2.7) + racc (1.7.3) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.2) - actioncable (= 6.1.7.2) - actionmailbox (= 6.1.7.2) - actionmailer (= 6.1.7.2) - actionpack (= 6.1.7.2) - actiontext (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activemodel (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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.2) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + 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.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbpdf (1.21.1) + rbpdf (1.21.3) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) redcarpet (3.5.1) - regexp_parser (2.8.1) + regexp_parser (2.8.2) request_store (1.5.1) rack (>= 1.4) - rexml (3.2.5) - roadie (5.1.0) + rexml (3.2.6) + roadie (5.2.0) css_parser (~> 1.4) - nokogiri (~> 1.8) + nokogiri (~> 1.15) roadie-rails (3.0.0) railties (>= 5.1, < 7.1) roadie (~> 5.0) - rotp (6.2.2) + rotp (6.3.0) rouge (3.28.0) rqrcode (2.2.0) chunky_png (~> 1.0) @@ -206,7 +206,7 @@ GEM rubocop-ast (>= 1.16.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) @@ -218,7 +218,7 @@ GEM ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.0.1) + sanitize (6.1.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) selenium-webdriver (3.142.7) @@ -230,31 +230,31 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sprockets (4.2.0) + 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.6) - thor (1.2.2) - timeout (0.4.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.4.2) + 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.5) + 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.8) + zeitwerk (2.6.12) PLATFORMS ruby @@ -275,18 +275,18 @@ DEPENDENCIES marcel mini_magick (~> 4.11.0) mini_mime (~> 1.1.0) - mocha (>= 1.4.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.13.10) + nokogiri (~> 1.15.2) pg (~> 1.4.2) puma - rails (= 6.1.7.2) + rails (= 6.1.7.6) rails-dom-testing - rbpdf (~> 1.21.0) + rbpdf (~> 1.21.3) redcarpet (~> 3.5.1) request_store (~> 1.5.0) rexml @@ -307,7 +307,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 2.7.7p221 + ruby 3.1.4p223 BUNDLED WITH - 2.3.26 + 2.4.12 diff --git a/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/default.nix index 1bb442919ccc..1235df9f6720 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, defaultGemConfig, makeWrapper, nixosTests }: let - version = "5.0.5"; + version = "5.0.6"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-qJrRxLub8CXmUnx3qxjI+vd0nJSpdcryz9u6AOsSpIE="; + hash = "sha256-SI/gjzeo6xARQVkiqOp0O3842Kel+IIpUKNKN13PCO4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix index 41b9b350e218..bfd433274b05 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; + sha256 = "1fdbks9byqqlkd6glj6lkz5f1z6948hh8fhv9x5pzqciralmz142"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; + sha256 = "1rfya6qgsl14cm9l2w7h7lg4znsyg3gqiskhqr8wn76sh0x2hln0"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; + sha256 = "0jr9jpf542svzqz8x68s08jnf30shxrrh7rq1a0s7jia5a5zx3qd"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; + sha256 = "0vf6ncs647psa9p23d2108zgmlf0pr7gcjr080yg5yf68gyhs53k"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; + sha256 = "1i8s3v6m8q3y17c40l6d3k2vs1mdqr0y1lfm7i6dfbj2y673lk9r"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; + sha256 = "1s4c1n5lv31sc7w4w74xz8gzyq3sann00bm4l7lxgy3vgi2wqkid"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; + sha256 = "1641003plszig5ybhrqy90fv43l1vcai5h35qmhh9j12byk5hp26"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; + sha256 = "148szdj5jlnfpv3nmy8cby8rxgpdvs43f3rzqby1f7a0l2knd3va"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; + sha256 = "0n7hg582ajdncilfk1kkw8qfdchymp2gqgkad1znlhlmclihsafr"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; + sha256 = "16pylwnqsbvq2wxhl7k1rnravbr3dgpjmnj0psz5gijgkydd52yc"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; + sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; ast = { groups = ["default" "test"]; @@ -198,10 +198,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; + sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx"; type = "gem"; }; - version = "0.23.9"; + version = "0.23.10"; }; concurrent-ruby = { groups = ["common_mark" "default" "test"]; @@ -229,20 +229,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; + sha256 = "18mii41bbl106rn940ah8v3xclj4yrxxa0bwlwp546244n9b83zp"; type = "gem"; }; - version = "1.14.0"; + version = "1.16.0"; }; csv = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5f5cq8ki3h4djh7pb8yqdkywqd08vjy3vd64yqh7qd6pdwky6w"; + sha256 = "1zmrgngggg4yvdbggdx9p3z4wcav4vxfigramxxvjh3hi7l12pig"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; deckar01-task_list = { dependencies = ["html-pipeline"]; @@ -300,10 +300,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; globalid = { dependencies = ["activesupport"]; @@ -311,10 +311,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; + sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -365,10 +365,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; type = "gem"; }; - version = "2.21.3"; + version = "2.22.0"; }; mail = { dependencies = ["mini_mime"]; @@ -426,30 +426,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.5"; }; minitest = { groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.18.1"; + version = "5.20.0"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -457,10 +457,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18xn9gm9yypavy9yck71fplan19hy5697mwd1rwzz7vizh3ip7bd"; + sha256 = "0lsll8iba8612dypk718l9kx73m9syiscb2rhciljys1krc5g1zr"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.0"; }; mysql2 = { groups = ["default"]; @@ -518,10 +518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { dependencies = ["net-protocol"]; @@ -539,10 +539,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; + sha256 = "1y99dfzlb3kgzh7pfk8km0p5zjiblxyh5rm8yal9h523vi5awji8"; type = "gem"; }; - version = "2.5.9"; + version = "2.6.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -550,10 +550,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; type = "gem"; }; - version = "1.13.10"; + version = "1.15.5"; }; parallel = { groups = ["default" "test"]; @@ -571,10 +571,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; + sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; type = "gem"; }; - version = "3.2.2.3"; + version = "3.2.2.4"; }; pg = { groups = ["default"]; @@ -599,10 +599,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.4"; }; puma = { dependencies = ["nio4r"]; @@ -610,30 +610,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "6.3.0"; + version = "6.4.0"; }; racc = { groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; rack = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-test = { dependencies = ["rack"]; @@ -652,32 +652,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; + sha256 = "0gf5dqabzd0mf0q39a07kf0smdm2cv2z5swl3zr4cz50yb85zz3l"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.0"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; + dependencies = ["loofah" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -685,10 +685,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; + sha256 = "1vq4ahyg9hraixxmmwwypdnpcylpvznvdxhj4xa23xk45wzbl3h7"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.6"; }; rainbow = { groups = ["default" "test"]; @@ -705,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; rb-fsevent = { groups = ["default" "development"]; @@ -737,10 +737,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwpwaj6h2wwg51sd0ai4j1gn8vsl5mkvbx9bivb9sp3iqh9vi6y"; + sha256 = "0rb6zqx79fzi0gqdq8xbhp87yp1ldfmzh0kng6fph84qhmzs990n"; type = "gem"; }; - version = "1.21.1"; + version = "1.21.3"; }; rbpdf-font = { groups = ["default"]; @@ -767,10 +767,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; + sha256 = "1d9a5s3qrjdy50ll2s32gg3qmf10ryp3v2nr5k718kvfadp50ray"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; request_store = { dependencies = ["rack"]; @@ -788,10 +788,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; roadie = { dependencies = ["css_parser" "nokogiri"]; @@ -799,10 +799,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0728slgr2rxx6v1mrh1416k1waj29szfa1jqpbiw3xrvgfpzvcm7"; + sha256 = "1qs594ybaz0lh2sakh95syzvhva4jms8xyiwhgjfncf3ri0qxp7l"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; roadie-rails = { dependencies = ["railties" "roadie"]; @@ -820,10 +820,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; + sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; type = "gem"; }; - version = "6.2.2"; + version = "6.3.0"; }; rouge = { groups = ["default"]; @@ -873,10 +873,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; + sha256 = "1cs9cc5p9q70valk4na3lki4xs88b52486p2v46yx3q1n5969bgs"; type = "gem"; }; - version = "1.29.0"; + version = "1.30.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -936,10 +936,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; + sha256 = "0wsw05y0h1ln3x2kvcw26fs9ivryb4xbjrb4hsk2pishkhydkz4j"; type = "gem"; }; - version = "6.0.1"; + version = "6.1.0"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; @@ -989,10 +989,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k0236g4h3ax7v6vp9k0l2fa0w6f1wqp7dn060zm4isw4n3k89sw"; + sha256 = "15rzfzd9dca4v0mr0bbhsbwhygl0k9l24iqqlx0fijig5zfi66wm"; type = "gem"; }; - version = "4.2.0"; + version = "4.2.1"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -1010,30 +1010,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d74lidgbvs0s7lrxvrjs5ljk6jfc970s3pr0djgmz0y6nzhx3nn"; + sha256 = "0w2lc1mqia13x43ajzhih419r40ppddg936ydhawz57f63ab6fll"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.7"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -1051,10 +1051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; @@ -1083,10 +1083,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -1124,9 +1124,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.12"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix index b369e5db05b1..8d6c7f072d04 100644 --- a/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix +++ b/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jgavris/rs-git-fsmonitor"; license = licenses.mit; maintainers = [ ]; + mainProgram = "rs-git-fsmonitor"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/sapling/default.nix b/nixpkgs/pkgs/applications/version-management/sapling/default.nix index 3a51d280db56..8e77f2d3cc6c 100644 --- a/nixpkgs/pkgs/applications/version-management/sapling/default.nix +++ b/nixpkgs/pkgs/applications/version-management/sapling/default.nix @@ -13,7 +13,7 @@ , fetchYarnDeps , yarn , nodejs -, fixup_yarn_lock +, prefetch-yarn-deps , glibcLocales , libiconv , Cocoa @@ -66,7 +66,7 @@ let inherit version; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps nodejs yarn ]; @@ -75,7 +75,7 @@ let runHook preBuild export HOME=$(mktemp -d) - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules diff --git a/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix b/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix index 38927d75757e..a94099e30478 100644 --- a/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix +++ b/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://github.com/mroth/scmpuff"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; + mainProgram = "scmpuff"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/scriv/default.nix b/nixpkgs/pkgs/applications/version-management/scriv/default.nix index 5ba5e26d3f14..fd7d78cc28a5 100644 --- a/nixpkgs/pkgs/applications/version-management/scriv/default.nix +++ b/nixpkgs/pkgs/applications/version-management/scriv/default.nix @@ -53,5 +53,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/nedbat/scriv/releases/tag/${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ amesgen ]; + mainProgram = "scriv"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix index d62ee38fc233..9f1aa7f91a79 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,22 +1,34 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , pyyaml , python +, unzip }: -buildPythonPackage rec { - pname = "pastesrht"; - version = "0.15.1"; +let + version = "0.15.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - sha256 = "sha256-IUFX7/V8AWqN+iuisLAyu7lMNIUCzSMoOfcZiYJTnrM="; + sha256 = "sha256-ZZzcd14Jbo1MfET7B56X/fl9xWXpCJ8TuKrGVgJwZfQ="; }; + pastesrht-api = buildGoModule ({ + inherit src version; + pname = "pastesrht-api"; + modRoot = "api"; + vendorHash = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); +in +buildPythonPackage rec { + inherit src version; + pname = "pastesrht"; + postPatch = '' substituteInPlace Makefile \ --replace "all: api" "" @@ -32,12 +44,17 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + mkdir -p $out/bin + ln -s ${pastesrht-api}/bin/api $out/bin/pastesrht-api + ''; + pythonImportsCheck = [ "pastesrht" ]; meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; description = "Ad-hoc text file hosting service for the sr.ht network"; license = licenses.agpl3Only; - maintainers = with maintainers; [ eadwu ]; + maintainers = with maintainers; [ eadwu nessdoor ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix b/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix index da6bb386535c..a13f25e68195 100644 --- a/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix +++ b/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation rec { homepage = "https://sparkleshare.org"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ kevincox ]; + mainProgram = "sparkleshare"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/src/default.nix b/nixpkgs/pkgs/applications/version-management/src/default.nix index f2f6f8cd32e1..5ac391977598 100644 --- a/nixpkgs/pkgs/applications/version-management/src/default.nix +++ b/nixpkgs/pkgs/applications/version-management/src/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ calvertvl AndersonTorres ]; inherit (python.meta) platforms; + mainProgram = "src"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/stgit/default.nix b/nixpkgs/pkgs/applications/version-management/stgit/default.nix index 196cdea93dba..f576859647c5 100644 --- a/nixpkgs/pkgs/applications/version-management/stgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/stgit/default.nix @@ -84,5 +84,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ jshholland ]; + mainProgram = "stg"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/svn-all-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/svn-all-fast-export/default.nix index a40e959a50a4..5fc67ef47d78 100644 --- a/nixpkgs/pkgs/applications/version-management/svn-all-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/svn-all-fast-export/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.flokli ]; + mainProgram = "svn-all-fast-export"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/svn2git/default.nix b/nixpkgs/pkgs/applications/version-management/svn2git/default.nix index 562658a6e99f..89ea5c0e84ae 100644 --- a/nixpkgs/pkgs/applications/version-management/svn2git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/svn2git/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { description = "Tool for importing Subversion repositories into git"; license = lib.licenses.mit; platforms = lib.platforms.unix; + mainProgram = "svn2git"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/tailor/default.nix b/nixpkgs/pkgs/applications/version-management/tailor/default.nix index bd824a71633c..3e2e6a848008 100644 --- a/nixpkgs/pkgs/applications/version-management/tailor/default.nix +++ b/nixpkgs/pkgs/applications/version-management/tailor/default.nix @@ -33,5 +33,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://gitlab.com/ports1/tailor"; license = licenses.gpl1Plus; platforms = platforms.unix; + mainProgram = "tailor"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/thicket/default.nix b/nixpkgs/pkgs/applications/version-management/thicket/default.nix index 1f331ffd4962..710cdda4f94a 100644 --- a/nixpkgs/pkgs/applications/version-management/thicket/default.nix +++ b/nixpkgs/pkgs/applications/version-management/thicket/default.nix @@ -26,5 +26,6 @@ crystal.buildCrystalPackage rec { homepage = "https://github.com/taylorthurlow/thicket"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "thicket"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/tig/default.nix b/nixpkgs/pkgs/applications/version-management/tig/default.nix index e4b54078edc5..1cce34df66ad 100644 --- a/nixpkgs/pkgs/applications/version-management/tig/default.nix +++ b/nixpkgs/pkgs/applications/version-management/tig/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "tig"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix b/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix index d4a4889f4a3f..ff4968d7166d 100644 --- a/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl2Plus; + mainProgram = "vcprompt"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix index 0625d0a684e0..bd056e8a7ce7 100644 --- a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ttuegel alerque ]; platforms = platforms.unix; + mainProgram = "vcsh"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/verco/default.nix b/nixpkgs/pkgs/applications/version-management/verco/default.nix index 22fe2b2fbbd2..4597a87b4721 100644 --- a/nixpkgs/pkgs/applications/version-management/verco/default.nix +++ b/nixpkgs/pkgs/applications/version-management/verco/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://vamolessa.github.io/verco"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; + mainProgram = "verco"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/nixpkgs/pkgs/applications/version-management/yadm/default.nix index 73a2035c31fb..0dab32e57acc 100644 --- a/nixpkgs/pkgs/applications/version-management/yadm/default.nix +++ b/nixpkgs/pkgs/applications/version-management/yadm/default.nix @@ -135,5 +135,6 @@ resholve.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ abathur ]; platforms = lib.platforms.unix; + mainProgram = "yadm"; }; } diff --git a/nixpkgs/pkgs/applications/video/adl/default.nix b/nixpkgs/pkgs/applications/video/adl/default.nix index 9dbec102a55e..6bf36cc375b8 100644 --- a/nixpkgs/pkgs/applications/video/adl/default.nix +++ b/nixpkgs/pkgs/applications/video/adl/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "adl"; }; } diff --git a/nixpkgs/pkgs/applications/video/aegisub/default.nix b/nixpkgs/pkgs/applications/video/aegisub/default.nix index 9b427a2284d7..2c01d052eeda 100644 --- a/nixpkgs/pkgs/applications/video/aegisub/default.nix +++ b/nixpkgs/pkgs/applications/video/aegisub/default.nix @@ -158,5 +158,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres wegank ]; platforms = platforms.unix; + mainProgram = "aegisub"; }; } diff --git a/nixpkgs/pkgs/applications/video/ani-cli/default.nix b/nixpkgs/pkgs/applications/video/ani-cli/default.nix index 21c04812f9f3..389d00dc1a41 100644 --- a/nixpkgs/pkgs/applications/video/ani-cli/default.nix +++ b/nixpkgs/pkgs/applications/video/ani-cli/default.nix @@ -58,5 +58,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ skykanin ]; platforms = platforms.unix; + mainProgram = "ani-cli"; }; } diff --git a/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix b/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix index 4b5102f25c27..93c8e8ec5ce8 100644 --- a/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.11"; + version = "1.2.12"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-N5caLFM6YJtarMaA7Ps5uWXmOtKM2KvHneDkN8ooJpw="; + sha256 = "sha256-J9MBnHrVnDaJ8Ykf/n8OkWKbK/JfMxorH9E+mKe3T8k="; }; sourceRoot = "source/src"; diff --git a/nixpkgs/pkgs/applications/video/anime-downloader/default.nix b/nixpkgs/pkgs/applications/video/anime-downloader/default.nix index 235c5c58f381..5e4f58cea1d3 100644 --- a/nixpkgs/pkgs/applications/video/anime-downloader/default.nix +++ b/nixpkgs/pkgs/applications/video/anime-downloader/default.nix @@ -50,5 +50,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.unlicense; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "anime"; }; } diff --git a/nixpkgs/pkgs/applications/video/asciicam/default.nix b/nixpkgs/pkgs/applications/video/asciicam/default.nix index fa9a232e0db9..6a600fec3083 100644 --- a/nixpkgs/pkgs/applications/video/asciicam/default.nix +++ b/nixpkgs/pkgs/applications/video/asciicam/default.nix @@ -23,5 +23,6 @@ buildGoModule { homepage = "https://github.com/muesli/asciicam"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "asciicam"; }; } diff --git a/nixpkgs/pkgs/applications/video/bilibili/default.nix b/nixpkgs/pkgs/applications/video/bilibili/default.nix index 9a507e93ab65..f7a9bd836745 100644 --- a/nixpkgs/pkgs/applications/video/bilibili/default.nix +++ b/nixpkgs/pkgs/applications/video/bilibili/default.nix @@ -41,8 +41,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electron-based bilibili desktop client"; homepage = "https://github.com/msojocs/bilibili-linux"; - license = licenses.mit; + license = with licenses; [ unfree mit ]; maintainers = with maintainers; [ jedsek kashw2 ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "bilibili"; }; } diff --git a/nixpkgs/pkgs/applications/video/bino3d/default.nix b/nixpkgs/pkgs/applications/video/bino3d/default.nix index d15d649b841b..92096c6a3474 100644 --- a/nixpkgs/pkgs/applications/video/bino3d/default.nix +++ b/nixpkgs/pkgs/applications/video/bino3d/default.nix @@ -21,5 +21,6 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; + mainProgram = "bino"; }; } diff --git a/nixpkgs/pkgs/applications/video/catt/default.nix b/nixpkgs/pkgs/applications/video/catt/default.nix index 90081d4e5908..8b1c74ee66cc 100644 --- a/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/nixpkgs/pkgs/applications/video/catt/default.nix @@ -46,5 +46,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/skorokithakis/catt"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "catt"; }; } diff --git a/nixpkgs/pkgs/applications/video/ccextractor/default.nix b/nixpkgs/pkgs/applications/video/ccextractor/default.nix index 8b2f185a55bd..3814f921fa24 100644 --- a/nixpkgs/pkgs/applications/video/ccextractor/default.nix +++ b/nixpkgs/pkgs/applications/video/ccextractor/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { broken = stdenv.isAarch64; license = licenses.gpl2Only; maintainers = with maintainers; [ titanous ]; + mainProgram = "ccextractor"; }; } diff --git a/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/nixpkgs/pkgs/applications/video/clipgrab/default.nix index 9a1940cffc75..1625c87e0c0b 100644 --- a/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -61,5 +61,6 @@ mkDerivation rec { homepage = "https://clipgrab.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "clipgrab"; }; } diff --git a/nixpkgs/pkgs/applications/video/coriander/default.nix b/nixpkgs/pkgs/applications/video/coriander/default.nix index d4e35ac48418..80892b96c94b 100644 --- a/nixpkgs/pkgs/applications/video/coriander/default.nix +++ b/nixpkgs/pkgs/applications/video/coriander/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; + mainProgram = "coriander"; }; } diff --git a/nixpkgs/pkgs/applications/video/crunchy-cli/default.nix b/nixpkgs/pkgs/applications/video/crunchy-cli/default.nix index 917fdd2f9a24..3efeeb8544d4 100644 --- a/nixpkgs/pkgs/applications/video/crunchy-cli/default.nix +++ b/nixpkgs/pkgs/applications/video/crunchy-cli/default.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { homepage = "https://github.com/crunchy-labs/crunchy-cli"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ stepbrobd ]; + mainProgram = "crunchy-cli"; }; } diff --git a/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix b/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix index 99694efda1d3..8070a96a2b4b 100644 --- a/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix +++ b/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix @@ -230,5 +230,6 @@ buildFHSEnv { maintainers = with maintainers; [ jshcmpbll ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "davinci-resolve"; }; } diff --git a/nixpkgs/pkgs/applications/video/deface/default.nix b/nixpkgs/pkgs/applications/video/deface/default.nix index 43c009c9dbb8..8b9e822070cf 100644 --- a/nixpkgs/pkgs/applications/video/deface/default.nix +++ b/nixpkgs/pkgs/applications/video/deface/default.nix @@ -52,5 +52,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/ORB-HD/deface"; license = licenses.mit; maintainers = with maintainers; [ lurkki ]; + mainProgram = "deface"; }; } diff --git a/nixpkgs/pkgs/applications/video/dra-cla/default.nix b/nixpkgs/pkgs/applications/video/dra-cla/default.nix index 3a097d3e130f..27b745a403d4 100644 --- a/nixpkgs/pkgs/applications/video/dra-cla/default.nix +++ b/nixpkgs/pkgs/applications/video/dra-cla/default.nix @@ -41,5 +41,6 @@ stdenvNoCC.mkDerivation { license = licenses.gpl3Only; maintainers = with maintainers; [ idlip ]; platforms = platforms.unix; + mainProgram = "dra-cla"; }; } diff --git a/nixpkgs/pkgs/applications/video/dvdbackup/default.nix b/nixpkgs/pkgs/applications/video/dvdbackup/default.nix index 3e998d0c4a17..523847db247f 100644 --- a/nixpkgs/pkgs/applications/video/dvdbackup/default.nix +++ b/nixpkgs/pkgs/applications/video/dvdbackup/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bradediger ]; platforms = lib.platforms.linux; + mainProgram = "dvdbackup"; }; } diff --git a/nixpkgs/pkgs/applications/video/dvdstyler/default.nix b/nixpkgs/pkgs/applications/video/dvdstyler/default.nix index 8d7d5a6611d3..18018f88d025 100644 --- a/nixpkgs/pkgs/applications/video/dvdstyler/default.nix +++ b/nixpkgs/pkgs/applications/video/dvdstyler/default.nix @@ -128,5 +128,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; + mainProgram = "dvdstyler"; }; } diff --git a/nixpkgs/pkgs/applications/video/entangle/default.nix b/nixpkgs/pkgs/applications/video/entangle/default.nix index daf56c174456..cfab93dbcd71 100644 --- a/nixpkgs/pkgs/applications/video/entangle/default.nix +++ b/nixpkgs/pkgs/applications/video/entangle/default.nix @@ -133,5 +133,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ ShamrockLee ]; + mainProgram = "entangle"; }; } diff --git a/nixpkgs/pkgs/applications/video/epgstation/default.nix b/nixpkgs/pkgs/applications/video/epgstation/default.nix index 49d2dedbb0c3..c5d12c8403c1 100644 --- a/nixpkgs/pkgs/applications/video/epgstation/default.nix +++ b/nixpkgs/pkgs/applications/video/epgstation/default.nix @@ -119,5 +119,6 @@ buildNpmPackage rec { homepage = "https://github.com/l3tnun/EPGStation"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; + mainProgram = "epgstation"; }; } diff --git a/nixpkgs/pkgs/applications/video/f1viewer/default.nix b/nixpkgs/pkgs/applications/video/f1viewer/default.nix index 7541ec6598a0..5d89a8df657c 100644 --- a/nixpkgs/pkgs/applications/video/f1viewer/default.nix +++ b/nixpkgs/pkgs/applications/video/f1viewer/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { homepage = "https://github.com/SoMuchForSubtlety/f1viewer"; license = licenses.gpl3Only; maintainers = with maintainers; [ michzappa ]; + mainProgram = "f1viewer"; }; } diff --git a/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix b/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix index 75a7a9b46bb7..a3b40daacf79 100644 --- a/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -25,5 +25,6 @@ buildPythonApplication rec { homepage = "https://github.com/slhck/ffmpeg-normalize"; license = with licenses; [ mit ]; maintainers = with maintainers; [ prusnak ]; + mainProgram = "ffmpeg-normalize"; }; } diff --git a/nixpkgs/pkgs/applications/video/filebot/default.nix b/nixpkgs/pkgs/applications/video/filebot/default.nix index 9fffd01019e8..e38b4dde3d29 100644 --- a/nixpkgs/pkgs/applications/video/filebot/default.nix +++ b/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -67,5 +67,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ gleber felschr ]; platforms = platforms.linux; + mainProgram = "filebot"; }; }) diff --git a/nixpkgs/pkgs/applications/video/flowblade/default.nix b/nixpkgs/pkgs/applications/video/flowblade/default.nix index 2643a449c60f..29d095fe67fd 100644 --- a/nixpkgs/pkgs/applications/video/flowblade/default.nix +++ b/nixpkgs/pkgs/applications/video/flowblade/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ polygon ]; + mainProgram = "flowblade"; }; } diff --git a/nixpkgs/pkgs/applications/video/freetube/default.nix b/nixpkgs/pkgs/applications/video/freetube/default.nix index a3fd87e6142e..b5a8221b7fdf 100644 --- a/nixpkgs/pkgs/applications/video/freetube/default.nix +++ b/nixpkgs/pkgs/applications/video/freetube/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Only; maintainers = with maintainers; [ ryneeverett alyaeanyx ]; inherit (electron.meta) platforms; + mainProgram = "freetube"; }; } diff --git a/nixpkgs/pkgs/applications/video/giph/default.nix b/nixpkgs/pkgs/applications/video/giph/default.nix index 3255544ff8b3..9d0175911d69 100644 --- a/nixpkgs/pkgs/applications/video/giph/default.nix +++ b/nixpkgs/pkgs/applications/video/giph/default.nix @@ -39,5 +39,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.lom ]; platforms = platforms.linux; + mainProgram = "giph"; }; } diff --git a/nixpkgs/pkgs/applications/video/glaxnimate/default.nix b/nixpkgs/pkgs/applications/video/glaxnimate/default.nix index 4ab5222c54ba..a50e3d15614a 100644 --- a/nixpkgs/pkgs/applications/video/glaxnimate/default.nix +++ b/nixpkgs/pkgs/applications/video/glaxnimate/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation rec { description = "Simple vector animation program."; license = licenses.gpl3; maintainers = with maintainers; [ tobiasBora ]; + mainProgram = "glaxnimate"; }; } diff --git a/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/nixpkgs/pkgs/applications/video/gnomecast/default.nix index 6e41dcb7b8e3..9d0bfa9e966e 100644 --- a/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -41,5 +41,6 @@ buildPythonApplication rec { homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; broken = stdenv.isDarwin; + mainProgram = "gnomecast"; }; } diff --git a/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/nixpkgs/pkgs/applications/video/go-chromecast/default.nix index 523eef1b8591..d554fd56847c 100644 --- a/nixpkgs/pkgs/applications/video/go-chromecast/default.nix +++ b/nixpkgs/pkgs/applications/video/go-chromecast/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "CLI for Google Chromecast, Home devices and Cast Groups"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; + mainProgram = "go-chromecast"; }; } diff --git a/nixpkgs/pkgs/applications/video/go2tv/default.nix b/nixpkgs/pkgs/applications/video/go2tv/default.nix index fb0db20990e4..d8fc548f10b3 100644 --- a/nixpkgs/pkgs/applications/video/go2tv/default.nix +++ b/nixpkgs/pkgs/applications/video/go2tv/default.nix @@ -53,5 +53,6 @@ buildGoModule rec { homepage = "https://github.com/alexballas/go2tv"; license = licenses.mit; maintainers = with maintainers; [ gdamjan ]; + mainProgram = "go2tv"; }; } diff --git a/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix b/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix index be02bb5c690e..052548f32f27 100644 --- a/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -1,15 +1,28 @@ -{ stdenv, lib, fetchgit, makeWrapper, pkg-config, cudatoolkit, glew, libX11 -, libXcomposite, glfw, libpulseaudio, ffmpeg }: - -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchurl +, makeWrapper +, pkg-config +, libXcomposite +, libpulseaudio +, ffmpeg +, wayland +, libdrm +, libva +, libglvnd +, libXrandr +}: + +stdenv.mkDerivation { pname = "gpu-screen-recorder"; - version = "1.0.0"; + version = "unstable-2023-11-18"; - src = fetchgit { - url = "https://repo.dec05eba.com/gpu-screen-recorder"; - rev = "36fd4516db06bcb192e49055319d1778bbed0322"; - sha256 = "sha256-hYEHM4FOYcPmQ5Yxh520PKy8HiD+G0xv9hrn8SmA07w="; + # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + src = fetchurl { + url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r418.5a8900e.tar.gz"; + hash = "sha256-Dal6KxQOTqoNH6e8lYk5XEXGFG/vzbguNFZ9yk9nKe0="; }; + sourceRoot = "."; nativeBuildInputs = [ pkg-config @@ -17,27 +30,26 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glew - libX11 libXcomposite - glfw libpulseaudio ffmpeg + wayland + libdrm + libva + libXrandr ]; - postPatch = '' - substituteInPlace ./build.sh \ - --replace '/opt/cuda/targets/x86_64-linux/include' '${cudatoolkit}/targets/x86_64-linux/include' \ - --replace '/usr/lib64/libcuda.so' '${cudatoolkit}/targets/x86_64-linux/lib/stubs/libcuda.so' - ''; - buildPhase = '' ./build.sh ''; - installPhase = '' - install -Dt $out/bin/ gpu-screen-recorder - wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib + postInstall = '' + install -Dt $out/bin gpu-screen-recorder gsr-kms-server + mkdir $out/bin/.wrapped + mv $out/bin/gpu-screen-recorder $out/bin/.wrapped/ + makeWrapper "$out/bin/.wrapped/gpu-screen-recorder" "$out/bin/gpu-screen-recorder" \ + --prefix LD_LIBRARY_PATH : ${libglvnd}/lib \ + --prefix PATH : $out/bin ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch b/nixpkgs/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch deleted file mode 100644 index bd0d7111c80a..000000000000 --- a/nixpkgs/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/build.sh b/build.sh -index 05603db..8c38b31 100755 ---- a/build.sh -+++ b/build.sh -@@ -2,5 +2,5 @@ - - dependencies="gtk+-3.0 x11 xrandr libpulse" - includes="$(pkg-config --cflags $dependencies)" --libs="$(pkg-config --libs $dependencies)" -+libs="$(pkg-config --libs $dependencies) -ldl" - g++ -o gpu-screen-recorder-gtk -O2 src/main.cpp -s $includes $libs -diff --git a/src/main.cpp b/src/main.cpp -index ae2078f..9dcdce1 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -15,6 +15,7 @@ - #include <pwd.h> - #include <libgen.h> - #include <functional> -+#include <dlfcn.h> - - typedef struct { - Display *display; -@@ -830,7 +831,13 @@ static void audio_input_change_callback(GtkComboBox *widget, gpointer userdata) - } - - static bool is_nv_fbc_installed() { -- return access("/usr/lib/libnvidia-fbc.so.1", F_OK) == 0 || access("/usr/local/lib/libnvidia-fbc.so.1", F_OK) == 0; -+ auto handle = dlopen("libnvidia-fbc.so.1", RTLD_LAZY); -+ if (handle) { -+ dlclose(handle); -+ return true; -+ } else { -+ return false; -+ } - } - - static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *app) { diff --git a/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index 6bfb425f0af9..cc3a5033bd11 100644 --- a/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -1,28 +1,36 @@ -{ stdenv, lib, fetchgit, pkg-config, makeWrapper, gtk3, libX11, libXrandr -, libpulseaudio, gpu-screen-recorder }: - -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchurl +, pkg-config +, makeWrapper +, gtk3 +, libpulseaudio +, libdrm +, gpu-screen-recorder +, libglvnd +, wrapGAppsHook +}: + +stdenv.mkDerivation { pname = "gpu-screen-recorder-gtk"; - version = "0.1.0"; + version = "3.2.5"; - src = fetchgit { - url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; - rev = "4c317abd0531f8e155fbbbcd32850bbeebbf2ead"; - sha256 = "sha256-5W6qmUMP31ndRDxMHuQ/XnZysPQgaie0vVlMTzfODU4="; + src = fetchurl { + url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.r175.cfd18af.tar.gz"; + hash = "sha256-HhZe22Hm9yGoy5WoyuP2+Wj8E3nMs4uf96mzmP6CMqU="; }; - - patches = [ ./fix-nvfbc-check.patch ]; + sourceRoot = "."; nativeBuildInputs = [ pkg-config makeWrapper + wrapGAppsHook ]; buildInputs = [ gtk3 - libX11 - libXrandr libpulseaudio + libdrm ]; buildPhase = '' @@ -33,7 +41,9 @@ stdenv.mkDerivation rec { install -Dt $out/bin/ gpu-screen-recorder-gtk install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop - wrapProgram $out/bin/gpu-screen-recorder-gtk --prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]} + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]}) + # we also append /run/opengl-driver/lib as it otherwise fails to find libcuda. + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}:/run/opengl-driver/lib) ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/video/haruna/default.nix b/nixpkgs/pkgs/applications/video/haruna/default.nix index b73933e36a71..8b112ed838a3 100644 --- a/nixpkgs/pkgs/applications/video/haruna/default.nix +++ b/nixpkgs/pkgs/applications/video/haruna/default.nix @@ -74,5 +74,6 @@ mkDerivation rec { description = "Open source video player built with Qt/QML and libmpv"; license = with licenses; [ bsd3 cc-by-40 cc-by-sa-40 cc0 gpl2Plus gpl3Plus wtfpl ]; maintainers = with maintainers; [ jojosch kashw2 ]; + mainProgram = "haruna"; }; } diff --git a/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix b/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix index 12689bedcbd3..c5ed409117e3 100644 --- a/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.louisdk1 ]; + mainProgram = "hdhomerun_config_gui"; }; } diff --git a/nixpkgs/pkgs/applications/video/hypnotix/default.nix b/nixpkgs/pkgs/applications/video/hypnotix/default.nix index 74d2389fce7b..647f171c8731 100644 --- a/nixpkgs/pkgs/applications/video/hypnotix/default.nix +++ b/nixpkgs/pkgs/applications/video/hypnotix/default.nix @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda bobby285271 ]; platforms = lib.platforms.linux; + mainProgram = "hypnotix"; }; } diff --git a/nixpkgs/pkgs/applications/video/imagination/default.nix b/nixpkgs/pkgs/applications/video/imagination/default.nix index 804265bcb545..8d1d6ac305f9 100644 --- a/nixpkgs/pkgs/applications/video/imagination/default.nix +++ b/nixpkgs/pkgs/applications/video/imagination/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ austinbutler ]; platforms = platforms.linux; + mainProgram = "imagination"; }; } diff --git a/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix index a5c6a7beb06b..dad9a5240249 100644 --- a/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -120,5 +120,6 @@ buildPythonApplication rec { unlicense ]; maintainers = with maintainers; [ jojosch ]; + mainProgram = "jellyfin-mpv-shim"; }; } diff --git a/nixpkgs/pkgs/applications/video/jftui/default.nix b/nixpkgs/pkgs/applications/video/jftui/default.nix index 6f5fb3cf6fbb..efd8d6ed6e2a 100644 --- a/nixpkgs/pkgs/applications/video/jftui/default.nix +++ b/nixpkgs/pkgs/applications/video/jftui/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = [ maintainers.nyanloutre ]; platforms = platforms.linux; + mainProgram = "jftui"; }; } diff --git a/nixpkgs/pkgs/applications/video/kaffeine/default.nix b/nixpkgs/pkgs/applications/video/kaffeine/default.nix index 02263f46e0f4..40701d2cbf85 100644 --- a/nixpkgs/pkgs/applications/video/kaffeine/default.nix +++ b/nixpkgs/pkgs/applications/video/kaffeine/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.pasqui23 ]; platforms = platforms.all; + mainProgram = "kaffeine"; }; } diff --git a/nixpkgs/pkgs/applications/video/kazam/default.nix b/nixpkgs/pkgs/applications/video/kazam/default.nix index a2a9d8d112cd..8ca3b813663f 100644 --- a/nixpkgs/pkgs/applications/video/kazam/default.nix +++ b/nixpkgs/pkgs/applications/video/kazam/default.nix @@ -58,5 +58,6 @@ python3Packages.buildPythonApplication rec { license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; + mainProgram = "kazam"; }; } diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix index 931667d8a58a..363b41035e00 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "arrow"; namespace = "script.module.arrow"; - version = "1.0.3.1"; + version = "1.2.3"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip"; - sha256 = "sha256-dFCAHlWgslxsAVQAPP3aDM6Fw+I9PP0ITUVTKJY2QXU="; + sha256 = "sha256-Et+9FJT1dRE1dFOrAQ70HJJcfylyLsiyay9wPJcSOXs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix index 7bbb62029bba..901d1d65716c 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix @@ -2,13 +2,13 @@ buildKodiAddon rec { pname = "osmc-skin"; namespace = "skin.osmc"; - version = "18.0.0"; + version = "20.1.0"; src = fetchFromGitHub { owner = "osmc"; repo = namespace; - rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0"; - sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s"; + rev = "v20.1.0-August-update"; + sha256 = "E/+gC7NlVRMaymeYMBO39/+rs0blDjr2zIROr24ekzQ="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix index 3100325ddd20..bb556e9ec822 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "radioparadise"; namespace = "script.radioparadise"; - version = "1.0.5"; + version = "2.0.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip"; - sha256 = "sha256-/X/8Q741piNHue5i/kgV+UYpBECyGzkFuN+PUzdeQnA="; + sha256 = "sha256-eRCP0XMQHmyDrZ8Y6RGFfxQ1r26/bWbE/PJz4PET7D8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/steam-launcher/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/steam-launcher/default.nix index c4a695b8f813..ef6b866e7e33 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/steam-launcher/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/steam-launcher/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, steam }: +{ lib, buildKodiAddon, fetchFromGitHub, steam, which, xdotool, dos2unix, wmctrl }: buildKodiAddon { pname = "steam-launcher"; namespace = "script.steam.launcher"; @@ -7,11 +7,19 @@ buildKodiAddon { src = fetchFromGitHub rec { owner = "teeedubb"; repo = owner + "-xbmc-repo"; - rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55"; - sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k"; + rev = "d5cea4b590b0ff08ac169b757946b7cb5145b983"; + sha256 = "sha256-arBMMOoHQuHRcJ7eXD1jvA45Svei7c0srcBZkdAzqY0="; }; - propagatedBuildInputs = [ steam ]; + propagatedBuildInputs = [ steam which xdotool ]; + + postInstall = '' + substituteInPlace $out/share/kodi/addons/script.steam.launcher/resources/main.py \ + --replace "\"which\"" "\"${which}/bin/which\"" \ + --replace "\"xdotool\"" "\"${xdotool}/bin/xdotool\"" \ + --replace "\"wmctrl\"" "\"${wmctrl}/bin/wmctrl\"" + ${dos2unix}/bin/dos2unix $out/share/kodi/addons/script.steam.launcher/resources/scripts/steam-launcher.sh + ''; meta = with lib; { homepage = "https://forum.kodi.tv/showthread.php?tid=157499"; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix index f1c203a2b958..fd52528b7ca0 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "typing_extensions"; namespace = "script.module.typing_extensions"; - version = "3.7.4.3"; + version = "4.7.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-GE9OfOIWtEKQcAmQZAK1uOFN4DQDiWU0YxUWICGDSFw="; + sha256 = "sha256-bCGPl5fGVyptCenpNXP/Msi7hu+UdtZd2ms7MfzbsbM="; }; passthru = { diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix index 9a15ab0a4947..b05e6deede85 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "websocket"; namespace = "script.module.websocket"; - version = "0.58.0+matrix.2"; + version = "1.6.2"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-xyOlKAAvtucC/tTm027ifEgiry/9gQneAcIwOGxmTkg="; + sha256 = "sha256-vJGijCjIgLJAdJvl+hCAPtvq7fy2ksgjY90vjVyqDkI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/lbry/default.nix b/nixpkgs/pkgs/applications/video/lbry/default.nix index afcec67d9134..cadd38523ca1 100644 --- a/nixpkgs/pkgs/applications/video/lbry/default.nix +++ b/nixpkgs/pkgs/applications/video/lbry/default.nix @@ -45,5 +45,6 @@ in appimageTools.wrapAppImage rec { changelog = "https://github.com/lbryio/lbry-desktop/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ enderger ]; platforms = [ "x86_64-linux" ]; + mainProgram = "lbry"; }; } diff --git a/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix b/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix index ad9a77af080a..bdf361cec9fc 100644 --- a/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix +++ b/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix @@ -23,5 +23,6 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "stopmotion"; }; } diff --git a/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix b/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix index 0e6b52f8f7ab..5fe8c8785a81 100644 --- a/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix +++ b/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix @@ -12,6 +12,7 @@ let homepage = "https://mifi.no/losslesscut/"; license = licenses.gpl2Only; maintainers = with maintainers; [ ShamrockLee ]; + mainProgram = "losslesscut"; }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; diff --git a/nixpkgs/pkgs/applications/video/mapmap/default.nix b/nixpkgs/pkgs/applications/video/mapmap/default.nix index 6bca33eb3885..39904f829159 100644 --- a/nixpkgs/pkgs/applications/video/mapmap/default.nix +++ b/nixpkgs/pkgs/applications/video/mapmap/default.nix @@ -73,6 +73,7 @@ mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; + mainProgram = "mapmap"; }; } diff --git a/nixpkgs/pkgs/applications/video/media-downloader/default.nix b/nixpkgs/pkgs/applications/video/media-downloader/default.nix index 61f59854debd..dd0d4924aaea 100644 --- a/nixpkgs/pkgs/applications/video/media-downloader/default.nix +++ b/nixpkgs/pkgs/applications/video/media-downloader/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ zendo ]; platforms = lib.platforms.linux; + mainProgram = "media-downloader"; }; }) diff --git a/nixpkgs/pkgs/applications/video/memento/default.nix b/nixpkgs/pkgs/applications/video/memento/default.nix index 8fda60e3a0a0..f09b3a79794d 100644 --- a/nixpkgs/pkgs/applications/video/memento/default.nix +++ b/nixpkgs/pkgs/applications/video/memento/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2; maintainers = with maintainers; [ teto ]; platforms = platforms.linux; + mainProgram = "memento"; }; }) diff --git a/nixpkgs/pkgs/applications/video/minitube/default.nix b/nixpkgs/pkgs/applications/video/minitube/default.nix index 06bed9211318..3caa2b7fc56c 100644 --- a/nixpkgs/pkgs/applications/video/minitube/default.nix +++ b/nixpkgs/pkgs/applications/video/minitube/default.nix @@ -39,5 +39,6 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "minitube"; }; } diff --git a/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix index a82839ef7548..f04025b37ddc 100644 --- a/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix +++ b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ gebner ]; + mainProgram = "mjpg_streamer"; }; } diff --git a/nixpkgs/pkgs/applications/video/mlv-app/default.nix b/nixpkgs/pkgs/applications/video/mlv-app/default.nix index 757759b1146f..e3bd3cbf99a2 100644 --- a/nixpkgs/pkgs/applications/video/mlv-app/default.nix +++ b/nixpkgs/pkgs/applications/video/mlv-app/default.nix @@ -58,5 +58,6 @@ mkDerivation rec { kiwi ]; platforms = platforms.linux; + mainProgram = "mlvapp"; }; } diff --git a/nixpkgs/pkgs/applications/video/molotov/default.nix b/nixpkgs/pkgs/applications/video/molotov/default.nix index 670eef3aa3ee..1930f06ffdb6 100644 --- a/nixpkgs/pkgs/applications/video/molotov/default.nix +++ b/nixpkgs/pkgs/applications/video/molotov/default.nix @@ -26,5 +26,6 @@ appimageTools.wrapType2 { license = with licenses; [ unfree ]; maintainers = with maintainers; [ apeyroux freezeboy ]; platforms = [ "x86_64-linux" ]; + mainProgram = "molotov"; }; } diff --git a/nixpkgs/pkgs/applications/video/motion/default.nix b/nixpkgs/pkgs/applications/video/motion/default.nix index 372ace9ffa3a..95bc37819240 100644 --- a/nixpkgs/pkgs/applications/video/motion/default.nix +++ b/nixpkgs/pkgs/applications/video/motion/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; + mainProgram = "motion"; }; } diff --git a/nixpkgs/pkgs/applications/video/mov-cli/default.nix b/nixpkgs/pkgs/applications/video/mov-cli/default.nix index 23954a05c5aa..829c4b83778d 100644 --- a/nixpkgs/pkgs/applications/video/mov-cli/default.nix +++ b/nixpkgs/pkgs/applications/video/mov-cli/default.nix @@ -35,5 +35,6 @@ python3.pkgs.buildPythonPackage rec { description = "A cli tool to browse and watch movies"; license = licenses.gpl3Only; maintainers = with maintainers; [ baitinq ]; + mainProgram = "mov-cli"; }; } diff --git a/nixpkgs/pkgs/applications/video/mpc-qt/default.nix b/nixpkgs/pkgs/applications/video/mpc-qt/default.nix index 372bc52044e7..73fab758d75e 100644 --- a/nixpkgs/pkgs/applications/video/mpc-qt/default.nix +++ b/nixpkgs/pkgs/applications/video/mpc-qt/default.nix @@ -24,5 +24,6 @@ mkDerivation rec { platforms = platforms.unix; broken = stdenv.isDarwin; maintainers = with maintainers; [ romildo ]; + mainProgram = "mpc-qt"; }; } diff --git a/nixpkgs/pkgs/applications/video/mpv/default.nix b/nixpkgs/pkgs/applications/video/mpv/default.nix index 33fb4fc78217..252f1637172f 100644 --- a/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchpatch , addOpenGLRunpath +, bash , docutils , meson , ninja @@ -153,19 +154,20 @@ in stdenv'.mkDerivation (finalAttrs: { meson ninja pkg-config - python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ] ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ + bash ffmpeg freetype libass libpthreadstubs libuchardet luaEnv + python3 ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals archiveSupport [ libarchive ] ++ lib.optionals bluraySupport [ libbluray ] @@ -231,6 +233,7 @@ in stdenv'.mkDerivation (finalAttrs: { # See the explanation in addOpenGLRunpath. postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/bin/mpv + patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh ''; passthru = { diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix index b86642305fc6..046b0fa2ea96 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -1,10 +1,34 @@ { lib , stdenvNoCC }: -let fileName = pathStr: lib.last (lib.splitString "/" pathStr); +let + inherit (lib) hasPrefix hasSuffix removeSuffix; + escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'"); + fileName = pathStr: lib.last (lib.splitString "/" pathStr); + nameFromPath = pathStr: + let fN = fileName pathStr; in + if hasSuffix ".lua" fN then + fN + else if !(hasPrefix "." fN) then + "${fN}.lua" + else + null + ; + scriptsDir = "$out/share/mpv/scripts"; in lib.makeOverridable ( - { pname, scriptPath ? "${pname}.lua", ... }@args: + { pname + , extraScripts ? [] + , ... }@args: + let + # either passthru.scriptName, inferred from scriptPath, or from pname + scriptName = (args.passthru or {}).scriptName or ( + if args ? scriptPath && nameFromPath args.scriptPath != null + then nameFromPath args.scriptPath + else "${pname}.lua" + ); + scriptPath = args.scriptPath or "./${scriptName}"; + in stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate { dontBuild = true; preferLocalBuild = true; @@ -12,11 +36,28 @@ lib.makeOverridable ( outputHashMode = "recursive"; installPhase = '' runHook preInstall - install -m644 -Dt $out/share/mpv/scripts ${scriptPath} + + if [ -d "${scriptPath}" ]; then + [ -f "${scriptPath}/main.lua" ] || { + echo "Script directory '${scriptPath}' does not contain 'main.lua'" >&2 + exit 1 + } + [ ${with builtins; toString (length extraScripts)} -eq 0 ] || { + echo "mpvScripts.buildLua does not support 'extraScripts'" \ + "when 'scriptPath' is a directory" + exit 1 + } + mkdir -p "${scriptsDir}" + cp -a "${scriptPath}" "${scriptsDir}/${lib.removeSuffix ".lua" scriptName}" + else + install -m644 -Dt "${scriptsDir}" \ + ${escapedList ([ scriptPath ] ++ extraScripts)} + fi + runHook postInstall ''; - passthru.scriptName = fileName scriptPath; + passthru = { inherit scriptName; }; meta.platforms = lib.platforms.all; } args) ) diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix index cdc641043f37..9d16deb1c529 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix @@ -16,11 +16,11 @@ in lib.recurseIntoAttrs mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; mpv-webm = callPackage ./mpv-webm.nix { }; - mpvacious = callPackage ./mpvacious.nix { }; + mpvacious = callPackage ./mpvacious.nix { inherit buildLua; }; quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; + simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; }; sponsorblock = callPackage ./sponsorblock.nix { }; - thumbfast = callPackage ./thumbfast.nix { }; + thumbfast = callPackage ./thumbfast.nix { inherit buildLua; }; thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; uosc = callPackage ./uosc.nix { }; visualizer = callPackage ./visualizer.nix { }; diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix index 4d7bb155f5cc..cc230c2f1f43 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,25 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, mpv-unwrapped }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, mpv-unwrapped, ffmpeg }: stdenv.mkDerivation rec { pname = "mpv-mpris"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; rev = version; - sha256 = "sha256-7kPpCfiWe58V4fBOsEVvGoGeNIlMUAyD1fqS5/8k/e4="; + hash = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib mpv-unwrapped ]; + buildInputs = [ glib mpv-unwrapped ffmpeg ]; postPatch = '' substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' ''; - installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; + installFlags = [ "SCRIPTS_DIR=${placeholder "out"}/share/mpv/scripts" ]; # Otherwise, the shared object isn't `strip`ped. See: # https://discourse.nixos.org/t/debug-why-a-derivation-has-a-reference-to-gcc/7009 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hoyon/mpv-mpris"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ajs124 ]; changelog = "https://github.com/hoyon/mpv-mpris/releases/tag/${version}"; }; } diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix index d2f2434fda11..93e1402289cd 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,20 +1,20 @@ { lib -, stdenvNoCC +, buildLua , fetchFromGitHub , curl , wl-clipboard , xclip }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpvacious"; - version = "0.24"; + version = "0.25"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-o0YcoSI+4934HlyIoI5V1h/FalCe+6tXS8Lg6kXWjSg="; + sha256 = "sha256-XTnib4cguWFEvZtmsLfkesbjFbkt2YoyYLT587ajyUM="; }; postPatch = '' @@ -26,23 +26,16 @@ stdenvNoCC.mkDerivation rec { --replace "'xclip" "'${xclip}/bin/xclip" ''; - dontBuild = true; - installPhase = '' runHook preInstall - rm -r .github - mkdir -p $out/share/mpv/scripts - cp -r . $out/share/mpv/scripts/mpvacious + make PREFIX=$out/share/mpv install runHook postInstall ''; - passthru.scriptName = "mpvacious"; - meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows"; homepage = "https://github.com/Ajatt-Tools/mpvacious"; license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = with maintainers; [ kmicklas ]; }; } diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix index d0eb2ca0119b..e4d82d17ca39 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -15,8 +15,8 @@ buildLua rec { hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; }; - passthru.scriptName = "quality-menu.lua"; - scriptPath = if oscSupport then "*.lua" else passthru.scriptName; + scriptPath = "quality-menu.lua"; + extraScripts = lib.optional oscSupport "quality-menu-osc.lua"; meta = with lib; { description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly"; diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index 01f2c3a099fa..c3b53c618396 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -1,21 +1,18 @@ -{ lib, stdenvNoCC +{ lib, buildLua , fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "simple-mpv-ui"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "open-dynaMIX"; repo = "simple-mpv-webui"; rev = "v${version}"; - sha256 = "1z0y8sdv5mbxznxqh43w5592ym688vkvqg7w26p8cinrhf09pbw8"; + hash = "sha256-I8lwpo3Hfpy3UnPMmHEJCdArVQnNL245NkxsYVmnMF0="; + sparseCheckout = [ "main.lua" "webui-page" ]; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp -r webui.lua webui-page $out/share/mpv/scripts/ - ''; + scriptPath = "."; passthru.scriptName = "webui.lua"; meta = with lib; { @@ -30,4 +27,3 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; }; } - diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix index 88209f049f6b..0226074ca31b 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -1,14 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub, mpv-unwrapped }: +{ lib, fetchFromGitHub, buildLua, mpv-unwrapped }: -stdenvNoCC.mkDerivation { - name = "mpv-thumbfast"; +buildLua { + pname = "mpv-thumbfast"; version = "unstable-2023-06-04"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "6f1d92da25a7b807427f55f085e7ad4d60c4e0d7"; - hash = "sha256-7CCxMPmZZRDIcWn+YbV4xzZFL80qZS5UFA25E+Y2P2Q="; + rev = "4241c7daa444d3859b51b65a39d30e922adb87e9"; + hash = "sha256-7EnFJVjEzqhWXAvhzURoOp/kad6WzwyidWxug6u8lVw="; }; postPatch = '' @@ -16,18 +16,7 @@ stdenvNoCC.mkDerivation { --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"' ''; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/mpv/scripts - cp -r thumbfast.lua $out/share/mpv/scripts/thumbfast.lua - - runHook postInstall - ''; - - passthru.scriptName = "thumbfast.lua"; + scriptPath = "thumbfast.lua"; meta = { description = "High-performance on-the-fly thumbnailer for mpv"; diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix index 29509bd033f3..4ed545363839 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -15,7 +15,9 @@ buildLua rec { postPatch = "patchShebangs concat_files.py"; dontBuild = false; - scriptPath = "mpv_thumbnail_script_{client_osc,server}.lua"; + scriptPath = "mpv_thumbnail_script_client_osc.lua"; + extraScripts = [ "mpv_thumbnail_script_server.lua" ]; + passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua"; meta = with lib; { description = "A lua script to show preview thumbnails in mpv's OSC seekbar"; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 2790cf19f58e..aee37b4b06d1 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -1,41 +1,53 @@ -{ alsa-lib -, asio +{ lib +, fetchFromGitHub + , cmake +, ninja + +, alsa-lib +, asio , curl -, fetchFromGitHub -, lib -, libremidi +, nlohmann_json , obs-studio , opencv , procps , qtbase , stdenv +, tesseract , websocketpp , xorg + +, httplib +, libremidi }: stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-rpZ/vR9QbWgr8n6LDv6iTRsKXSIDGy0IpPu1Uatb0zw="; + hash = "sha256-Xnf8Vz6I5EfiiVoG0JRd0f0IJHw1IVkTLL4Th/hWYrc="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ninja + ]; buildInputs = [ alsa-lib asio curl libremidi + nlohmann_json obs-studio opencv procps qtbase + tesseract websocketpp xorg.libXScrnSaver ]; @@ -43,7 +55,9 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; postUnpack = '' + cp -r ${httplib.src}/* $sourceRoot/deps/cpp-httplib cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi + chmod -R +w $sourceRoot/deps/cpp-httplib chmod -R +w $sourceRoot/deps/libremidi ''; @@ -53,11 +67,11 @@ stdenv.mkDerivation rec { mv $out/data $out/share/obs ''; - meta = { + meta = with lib; { description = "An automated scene switcher for OBS Studio"; homepage = "https://github.com/WarmUpTill/SceneSwitcher"; - maintainers = with lib.maintainers; [ paveloom ]; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ paveloom ]; }; } diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index f6eb8b34f40a..b8e294be14a0 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.9.5"; + version = "2.9.6"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-7qgFUZmKldIfnUXthzWd07CtOmaJROnqCGnzjlZlN3E="; + sha256 = "sha256-A3R78JvjOdYE9/ZZ+KbZ5Ula9HC5E/u7BrqE2i6VwYs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix index f72e1756c41d..61165bbf6cbb 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-transition-table"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-transition-table"; rev = version; - sha256 = "sha256-Is2XWMPhqd/rd6cXc40eSZTvSRpbroTBzM4SPfHOWPg="; + sha256 = "sha256-rGF7hugC5ybpZBAIIXDiy3YDooMawf/yYX2YucQm2/U="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index ffea337c329c..6d11ed2ffd55 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-6I73YukhqOLsqVimTfVKYG6LzIYoJRnMaxkPhEAinfQ="; + sha256 = "sha256-gDM2S/ygN58iodfO5d34LYUclkzf+nAIBWp+wFeWWik="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/video/olive-editor/default.nix b/nixpkgs/pkgs/applications/video/olive-editor/default.nix index 5daac65313e8..f23ed20c797b 100644 --- a/nixpkgs/pkgs/applications/video/olive-editor/default.nix +++ b/nixpkgs/pkgs/applications/video/olive-editor/default.nix @@ -79,5 +79,6 @@ stdenv.mkDerivation { platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; + mainProgram = "olive-editor"; }; } diff --git a/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix b/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix index f3ac6414a709..02c9d80a43ea 100644 --- a/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix +++ b/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix @@ -34,5 +34,6 @@ buildGoModule rec { homepage = "https://github.com/Baldomo/open-in-mpv"; license = licenses.gpl3Only; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "open-in-mpv"; }; } diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index ec980f1bfd1b..f209c092bdc1 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -80,5 +80,6 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "openshot-qt"; }; } diff --git a/nixpkgs/pkgs/applications/video/p2pvc/default.nix b/nixpkgs/pkgs/applications/video/p2pvc/default.nix index f64af16709f6..ec2f0c95f899 100644 --- a/nixpkgs/pkgs/applications/video/p2pvc/default.nix +++ b/nixpkgs/pkgs/applications/video/p2pvc/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = with lib.maintainers; [ trino ]; platforms = with lib.platforms; linux; + mainProgram = "p2pvc"; }; } diff --git a/nixpkgs/pkgs/applications/video/peek/default.nix b/nixpkgs/pkgs/applications/video/peek/default.nix index b8dff4f1af77..105a86fbf4a7 100644 --- a/nixpkgs/pkgs/applications/video/peek/default.nix +++ b/nixpkgs/pkgs/applications/video/peek/default.nix @@ -89,5 +89,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ puffnfresh ]; platforms = platforms.linux; + mainProgram = "peek"; }; } diff --git a/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix b/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix index 18e38122f27c..5fc574881cfb 100644 --- a/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix +++ b/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix @@ -83,5 +83,6 @@ buildPerlModule rec { license = licenses.artistic2; maintainers = with maintainers; [ julm ]; platforms = platforms.all; + mainProgram = "pipe-viewer"; }; } diff --git a/nixpkgs/pkgs/applications/video/pitivi/default.nix b/nixpkgs/pkgs/applications/video/pitivi/default.nix index d37fc66cb036..1b8c40e233a5 100644 --- a/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -104,5 +104,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ akechishiro ]; platforms = platforms.linux; + mainProgram = "pitivi"; }; } diff --git a/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index 90f18613ca07..2e71c4668356 100644 --- a/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -47,5 +47,6 @@ buildPythonApplication rec { maintainers = with maintainers; [ devusb ]; license = licenses.mit; platforms = platforms.linux; + mainProgram = "plex-mpv-shim"; }; } diff --git a/nixpkgs/pkgs/applications/video/popcorntime/default.nix b/nixpkgs/pkgs/applications/video/popcorntime/default.nix index a12171772966..9e5a14d4983c 100644 --- a/nixpkgs/pkgs/applications/video/popcorntime/default.nix +++ b/nixpkgs/pkgs/applications/video/popcorntime/default.nix @@ -89,5 +89,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3; maintainers = with maintainers; [ onny ]; + mainProgram = "popcorntime"; }; } diff --git a/nixpkgs/pkgs/applications/video/prism/default.nix b/nixpkgs/pkgs/applications/video/prism/default.nix index 8fa0c7b03762..68ef965ec1ab 100644 --- a/nixpkgs/pkgs/applications/video/prism/default.nix +++ b/nixpkgs/pkgs/applications/video/prism/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/muesli/prism"; license = licenses.mit; maintainers = with maintainers; [ paperdigits ]; + mainProgram = "prism"; }; } diff --git a/nixpkgs/pkgs/applications/video/qarte/default.nix b/nixpkgs/pkgs/applications/video/qarte/default.nix index be2ac3c7413c..e237a1c641a9 100644 --- a/nixpkgs/pkgs/applications/video/qarte/default.nix +++ b/nixpkgs/pkgs/applications/video/qarte/default.nix @@ -42,5 +42,6 @@ in mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ vbgl ]; platforms = platforms.linux; + mainProgram = "qarte"; }; } diff --git a/nixpkgs/pkgs/applications/video/qmediathekview/default.nix b/nixpkgs/pkgs/applications/video/qmediathekview/default.nix index e37a8b1ed4ae..359679103497 100644 --- a/nixpkgs/pkgs/applications/video/qmediathekview/default.nix +++ b/nixpkgs/pkgs/applications/video/qmediathekview/default.nix @@ -38,5 +38,6 @@ mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; broken = stdenv.isAarch64; + mainProgram = "QMediathekView"; }; } diff --git a/nixpkgs/pkgs/applications/video/qstopmotion/default.nix b/nixpkgs/pkgs/applications/video/qstopmotion/default.nix index 469ba5b8eaa6..3172c4bb4343 100644 --- a/nixpkgs/pkgs/applications/video/qstopmotion/default.nix +++ b/nixpkgs/pkgs/applications/video/qstopmotion/default.nix @@ -81,5 +81,6 @@ mkDerivation rec { maintainers = [ maintainers.leenaars ]; broken = stdenv.isAarch64; platforms = lib.platforms.gnu ++ lib.platforms.linux; + mainProgram = "qstopmotion"; }; } diff --git a/nixpkgs/pkgs/applications/video/quvi/library.nix b/nixpkgs/pkgs/applications/video/quvi/library.nix deleted file mode 100644 index 548b3d7f9724..000000000000 --- a/nixpkgs/pkgs/applications/video/quvi/library.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: - -stdenv.mkDerivation rec { - pname = "libquvi"; - version="0.9.4"; - - src = fetchurl { - url = "mirror://sourceforge/quvi/libquvi-${version}.tar.xz"; - sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ]; - - meta = { - description = "Web video downloader"; - homepage = "http://quvi.sf.net"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - broken = true; # missing glibc-2.34 support, no upstream activity - }; -} diff --git a/nixpkgs/pkgs/applications/video/quvi/scripts.nix b/nixpkgs/pkgs/applications/video/quvi/scripts.nix deleted file mode 100644 index a31ef6e72ae6..000000000000 --- a/nixpkgs/pkgs/applications/video/quvi/scripts.nix +++ /dev/null @@ -1,22 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config}: - -stdenv.mkDerivation rec { - pname = "quvi-scripts"; - version="0.9.20131130"; - - src = fetchurl { - url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.xz"; - sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"; - }; - - nativeBuildInputs = [ pkg-config ]; - - meta = { - description = "Web video downloader"; - homepage = "http://quvi.sf.net"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - broken = true; # missing glibc-2.34 support, no upstream activity - }; -} diff --git a/nixpkgs/pkgs/applications/video/quvi/tool.nix b/nixpkgs/pkgs/applications/video/quvi/tool.nix deleted file mode 100644 index ad6233cbd001..000000000000 --- a/nixpkgs/pkgs/applications/video/quvi/tool.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: - -stdenv.mkDerivation rec { - pname = "quvi"; - version="0.9.5"; - - src = fetchurl { - url = "mirror://sourceforge/quvi/quvi-${version}.tar.xz"; - sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; - }; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ lua5 curl quvi_scripts libquvi glib ]; - postInstall = '' - wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" - ''; - - meta = { - description = "Web video downloader"; - homepage = "http://quvi.sf.net"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - broken = true; # missing glibc-2.34 support, no upstream activity - }; -} diff --git a/nixpkgs/pkgs/applications/video/recapp/default.nix b/nixpkgs/pkgs/applications/video/recapp/default.nix index 1e644ff9f417..c15a0680a933 100644 --- a/nixpkgs/pkgs/applications/video/recapp/default.nix +++ b/nixpkgs/pkgs/applications/video/recapp/default.nix @@ -77,5 +77,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/amikha1lov/RecApp"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "recapp"; }; } diff --git a/nixpkgs/pkgs/applications/video/screenkey/default.nix b/nixpkgs/pkgs/applications/video/screenkey/default.nix index 83ebf1db9b4e..90cf5e7dcf24 100644 --- a/nixpkgs/pkgs/applications/video/screenkey/default.nix +++ b/nixpkgs/pkgs/applications/video/screenkey/default.nix @@ -64,5 +64,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.rasendubi ]; + mainProgram = "screenkey"; }; } diff --git a/nixpkgs/pkgs/applications/video/shotcut/default.nix b/nixpkgs/pkgs/applications/video/shotcut/default.nix index 5abc6c47a134..efa7782891ce 100644 --- a/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -93,5 +93,6 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ goibhniu woffs peti ]; platforms = platforms.linux; + mainProgram = "shotcut"; }; } diff --git a/nixpkgs/pkgs/applications/video/srtrelay/default.nix b/nixpkgs/pkgs/applications/video/srtrelay/default.nix index 43901d1524ad..8640424be1e9 100644 --- a/nixpkgs/pkgs/applications/video/srtrelay/default.nix +++ b/nixpkgs/pkgs/applications/video/srtrelay/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/voc/srtrelay"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; + mainProgram = "srtrelay"; }; } diff --git a/nixpkgs/pkgs/applications/video/streamlink/default.nix b/nixpkgs/pkgs/applications/video/streamlink/default.nix index ba1f724cbf4f..f6eef2ea9a24 100644 --- a/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.3.1"; + version = "6.4.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-k8Dfrl0Xie5zF/GhVdP/RKGajDyGblAwu49UekX1WEQ="; + hash = "sha256-tftxn0JRppLIh4ih1G4s0PoiMZYMUrKBy4IQhxxyLnY="; }; nativeCheckInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/video/sub-batch/default.nix b/nixpkgs/pkgs/applications/video/sub-batch/default.nix index 9455f6d1a1e4..bc0d6bd3a6cb 100644 --- a/nixpkgs/pkgs/applications/video/sub-batch/default.nix +++ b/nixpkgs/pkgs/applications/video/sub-batch/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ erictapen ]; broken = stdenv.isDarwin; + mainProgram = "sub-batch"; }; } diff --git a/nixpkgs/pkgs/applications/video/subdl/default.nix b/nixpkgs/pkgs/applications/video/subdl/default.nix index 95f7be2cbcaf..773d1f1ad423 100644 --- a/nixpkgs/pkgs/applications/video/subdl/default.nix +++ b/nixpkgs/pkgs/applications/video/subdl/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { platforms = lib.platforms.all; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.exfalso ]; + mainProgram = "subdl"; }; } diff --git a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix index 56d830a2ac76..fd8e03963dca 100644 --- a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix +++ b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.plcplc ]; + mainProgram = "subtitleeditor"; }; } diff --git a/nixpkgs/pkgs/applications/video/tartube/default.nix b/nixpkgs/pkgs/applications/video/tartube/default.nix index 859cd8e8cc36..b1b05a524f74 100644 --- a/nixpkgs/pkgs/applications/video/tartube/default.nix +++ b/nixpkgs/pkgs/applications/video/tartube/default.nix @@ -74,5 +74,6 @@ python3Packages.buildPythonApplication rec { platforms = platforms.linux; maintainers = with maintainers; [ mkg20001 luc65r ]; homepage = "https://tartube.sourceforge.io/"; + mainProgram = "tartube"; }; } diff --git a/nixpkgs/pkgs/applications/video/timelens/default.nix b/nixpkgs/pkgs/applications/video/timelens/default.nix index 05455b0f84f7..bd38a4c2f76a 100644 --- a/nixpkgs/pkgs/applications/video/timelens/default.nix +++ b/nixpkgs/pkgs/applications/video/timelens/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ janik ]; + mainProgram = "timelens"; }; } diff --git a/nixpkgs/pkgs/applications/video/uvccapture/default.nix b/nixpkgs/pkgs/applications/video/uvccapture/default.nix index be0a7fcd2416..96e42b1a7f95 100644 --- a/nixpkgs/pkgs/applications/video/uvccapture/default.nix +++ b/nixpkgs/pkgs/applications/video/uvccapture/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "uvccapture"; }; } diff --git a/nixpkgs/pkgs/applications/video/vcs/default.nix b/nixpkgs/pkgs/applications/video/vcs/default.nix index 37ea20718fd6..e21e3a98f1f7 100644 --- a/nixpkgs/pkgs/applications/video/vcs/default.nix +++ b/nixpkgs/pkgs/applications/video/vcs/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { license = licenses.cc-by-nc-sa-30; maintainers = with maintainers; [ elitak ]; platforms = with platforms; unix; + mainProgram = "vcs"; }; } diff --git a/nixpkgs/pkgs/applications/video/video-trimmer/default.nix b/nixpkgs/pkgs/applications/video/video-trimmer/default.nix index d61f30de1be5..d3d55d2cb4a6 100644 --- a/nixpkgs/pkgs/applications/video/video-trimmer/default.nix +++ b/nixpkgs/pkgs/applications/video/video-trimmer/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "video-trimmer"; }; }) diff --git a/nixpkgs/pkgs/applications/video/vivictpp/default.nix b/nixpkgs/pkgs/applications/video/vivictpp/default.nix index 13f3564fa0d0..9b8a8773b1b4 100644 --- a/nixpkgs/pkgs/applications/video/vivictpp/default.nix +++ b/nixpkgs/pkgs/applications/video/vivictpp/default.nix @@ -69,5 +69,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ tilpner ]; + mainProgram = "vivictpp"; }; } diff --git a/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix index 6f445da73d38..15d59af318fb 100644 --- a/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix @@ -69,5 +69,6 @@ mkDerivation rec { homepage = "https://github.com/vkohaupt/vokoscreenNG"; maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; + mainProgram = "vokoscreenNG"; }; } diff --git a/nixpkgs/pkgs/applications/video/vokoscreen/default.nix b/nixpkgs/pkgs/applications/video/vokoscreen/default.nix index 82c23b4892e4..cb0df69ee2c5 100644 --- a/nixpkgs/pkgs/applications/video/vokoscreen/default.nix +++ b/nixpkgs/pkgs/applications/video/vokoscreen/default.nix @@ -53,5 +53,6 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.league ]; platforms = platforms.linux; + mainProgram = "vokoscreen"; }; } diff --git a/nixpkgs/pkgs/applications/video/w_scan/default.nix b/nixpkgs/pkgs/applications/video/w_scan/default.nix index 1a8c6f2d3adb..4dedf71d39bf 100644 --- a/nixpkgs/pkgs/applications/video/w_scan/default.nix +++ b/nixpkgs/pkgs/applications/video/w_scan/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nico202 ] ; license = lib.licenses.gpl2; + mainProgram = "w_scan"; }; } diff --git a/nixpkgs/pkgs/applications/video/w_scan2/default.nix b/nixpkgs/pkgs/applications/video/w_scan2/default.nix index 26202ee18bc2..b1a4c907c0db 100644 --- a/nixpkgs/pkgs/applications/video/w_scan2/default.nix +++ b/nixpkgs/pkgs/applications/video/w_scan2/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ _0x4A6F ] ; license = lib.licenses.gpl2Only; + mainProgram = "w_scan2"; }; } diff --git a/nixpkgs/pkgs/applications/video/webcamoid/default.nix b/nixpkgs/pkgs/applications/video/webcamoid/default.nix index b8d7e7b6bfed..799e68bf072e 100644 --- a/nixpkgs/pkgs/applications/video/webcamoid/default.nix +++ b/nixpkgs/pkgs/applications/video/webcamoid/default.nix @@ -31,5 +31,6 @@ mkDerivation rec { license = [ licenses.gpl3Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ robaca ]; + mainProgram = "webcamoid"; }; } diff --git a/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix index 925fa38a199a..75a8d9f5c639 100644 --- a/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix @@ -57,6 +57,7 @@ buildNpmPackage { homepage = "https://webtorrent.io/desktop"; license = licenses.mit; maintainers = [ maintainers.bendlas ]; + mainProgram = "WebTorrent"; }; } diff --git a/nixpkgs/pkgs/applications/video/wf-recorder/default.nix b/nixpkgs/pkgs/applications/video/wf-recorder/default.nix index 8799455834a9..56a85517eb0a 100644 --- a/nixpkgs/pkgs/applications/video/wf-recorder/default.nix +++ b/nixpkgs/pkgs/applications/video/wf-recorder/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ yuka ]; platforms = platforms.linux; + mainProgram = "wf-recorder"; }; } diff --git a/nixpkgs/pkgs/applications/video/xscast/default.nix b/nixpkgs/pkgs/applications/video/xscast/default.nix index f3b44bf7c6aa..4e7252a514f8 100644 --- a/nixpkgs/pkgs/applications/video/xscast/default.nix +++ b/nixpkgs/pkgs/applications/video/xscast/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { license = licenses.mit; description = "Screencasts of windows with list of keystrokes overlayed"; maintainers = with maintainers; [ ]; + mainProgram = "xscast"; }; } diff --git a/nixpkgs/pkgs/applications/video/youtube-tui/default.nix b/nixpkgs/pkgs/applications/video/youtube-tui/default.nix index e0ede1f1e704..bfa1039d5d33 100644 --- a/nixpkgs/pkgs/applications/video/youtube-tui/default.nix +++ b/nixpkgs/pkgs/applications/video/youtube-tui/default.nix @@ -52,5 +52,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://siriusmart.github.io/youtube-tui"; license = licenses.gpl3Only; maintainers = with maintainers; [ Ruixi-rebirth ]; + mainProgram = "youtube-tui"; }; } diff --git a/nixpkgs/pkgs/applications/video/yuview/default.nix b/nixpkgs/pkgs/applications/video/yuview/default.nix index 7df47d3f4256..a6c7ad6ceb86 100644 --- a/nixpkgs/pkgs/applications/video/yuview/default.nix +++ b/nixpkgs/pkgs/applications/video/yuview/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ leixb ]; platforms = platforms.unix; + mainProgram = "YUView"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index eada778e1c69..ca2c0f890d9a 100644 --- a/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -7,7 +7,9 @@ , tpmSupport ? false , tlsSupport ? false , debug ? false -, sourceDebug ? debug +# Usually, this option is broken, do not use it except if you know what you are +# doing. +, sourceDebug ? false }: assert csmSupport -> seabios != null; @@ -20,6 +22,8 @@ let "OvmfPkg/OvmfPkgX64.dsc" else if stdenv.hostPlatform.isAarch then "ArmVirtPkg/ArmVirtQemu.dsc" + else if stdenv.hostPlatform.isRiscV then + "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc" else throw "Unsupported architecture"; @@ -67,7 +71,8 @@ edk2.mkDerivation projectDscPath (finalAttrs: { cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin ''; - postFixup = if stdenv.hostPlatform.isAarch then '' + postFixup = ( + if stdenv.hostPlatform.isAarch then '' mkdir -vp $fd/FV mkdir -vp $fd/AAVMF mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV @@ -80,10 +85,18 @@ edk2.mkDerivation projectDscPath (finalAttrs: { # Also add symlinks for Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw - '' else '' + '' + else if stdenv.hostPlatform.isRiscV then '' + mkdir -vp $fd/FV + + mv -v $out/FV/RISCV_VIRT_{CODE,VARS}.fd $fd/FV/ + truncate -s 32M $fd/FV/RISCV_VIRT_CODE.fd + truncate -s 32M $fd/FV/RISCV_VIRT_VARS.fd + '' + else '' mkdir -vp $fd/FV mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV - ''; + ''); dontPatchELF = true; @@ -105,5 +118,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: { license = lib.licenses.bsd2; inherit (edk2.meta) platforms; maintainers = with lib.maintainers; [ adamcstephens raitobezarius ]; + broken = stdenv.isDarwin; }; }) diff --git a/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix b/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix index 3e7027f9dfd9..df354c08f414 100644 --- a/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ lesuisse ]; + mainProgram = "buildkit-nix"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix b/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix index 5b66a59e5850..f7b2b973ab57 100644 --- a/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ] ++ teams.podman.members; platforms = platforms.linux; + mainProgram = "catatonit"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index 346e3f45f633..f40fbc0f4284 100644 --- a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -5,9 +5,9 @@ version = 3 [[package]] name = "acpi_tables" version = "0.1.0" -source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#1029d22777f07b04849234bbe756da34a6df2913" +source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#1a733bf690ccc10bdfeacad33e3c9f6cce0008fd" dependencies = [ - "zerocopy 0.6.1", + "zerocopy", ] [[package]] @@ -35,6 +35,55 @@ dependencies = [ ] [[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] name = "anyhow" version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -76,40 +125,12 @@ dependencies = [ ] [[package]] -name = "argh" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab257697eb9496bf75526f0217b5ed64636a9cfafa78b8365c71bd283fcef93e" -dependencies = [ - "argh_derive", - "argh_shared", -] - -[[package]] -name = "argh_derive" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b382dbd3288e053331f03399e1db106c9fb0d8562ad62cb04859ae926f324fa6" -dependencies = [ - "argh_shared", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "argh_shared" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cb94155d965e3d37ffbbe7cc5b82c3dd79dd33bd48e536f73d2cfb8d85506f" - -[[package]] name = "async-broadcast" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -120,7 +141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -164,7 +185,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.21", + "rustix 0.37.25", "slab", "socket2", "waker-fn", @@ -176,24 +197,23 @@ version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" dependencies = [ "async-io", "async-lock", - "autocfg", + "async-signal", "blocking", "cfg-if", - "event-listener", + "event-listener 3.0.0", "futures-lite", - "rustix 0.37.21", - "signal-hook", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -209,6 +229,25 @@ dependencies = [ ] [[package]] +name = "async-signal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c99f3cb3f9ff89f7d718fbb942c9eb91bedff12e396adf09a622dfe7ffec2bc2" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "concurrent-queue", + "futures-core", + "futures-io", + "libc", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] name = "async-task" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -216,9 +255,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", @@ -227,9 +266,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -262,6 +301,17 @@ dependencies = [ ] [[package]] +name = "bitfield-struct" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac32db62a43cf33353ce30b4a208b08193ea2086a1c6c004acb0073c706a29d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -269,9 +319,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block" @@ -347,12 +397,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "clap" +version = "4.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "once_cell", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] name = "cloud-hypervisor" -version = "35.0.0" +version = "36.0.0" dependencies = [ "anyhow", "api_client", - "argh", + "clap", "dhat", "dirs", "epoll", @@ -378,6 +457,12 @@ dependencies = [ ] [[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "concurrent-queue" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -405,6 +490,15 @@ dependencies = [ ] [[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] name = "crc64" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -482,7 +576,7 @@ dependencies = [ "acpi_tables", "anyhow", "arch", - "bitflags 2.3.3", + "bitflags 2.4.1", "byteorder", "event_monitor", "hypervisor", @@ -549,9 +643,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -559,9 +653,9 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", @@ -587,29 +681,24 @@ version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "libc", ] [[package]] -name = "errno" -version = "0.3.2" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "cc", "libc", + "windows-sys 0.48.0", ] [[package]] @@ -619,6 +708,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "event_monitor" version = "0.1.0" dependencies = [ @@ -834,15 +934,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -864,6 +964,8 @@ dependencies = [ "byteorder", "env_logger", "iced-x86", + "igvm", + "igvm_defs", "kvm-bindings", "kvm-ioctls", "libc", @@ -880,9 +982,9 @@ dependencies = [ [[package]] name = "iced-x86" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cc8d38244d84278262c8ebe6930cc44283d194cbabae2651f6112103802fb5" +checksum = "cdd366a53278429c028367e0ba22a46cab6d565a57afb959f06e92c7a69e7828" dependencies = [ "lazy_static", ] @@ -894,12 +996,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] +name = "igvm" +version = "0.1.0" +source = "git+https://github.com/microsoft/igvm?branch=main#c1b0201d8286cb23b9f30cb16ba435484666cfa3" +dependencies = [ + "bitfield-struct", + "crc32fast", + "hex", + "igvm_defs", + "open-enum", + "range_map_vec", + "thiserror", + "tracing", + "zerocopy", +] + +[[package]] +name = "igvm_defs" +version = "0.1.0" +source = "git+https://github.com/microsoft/igvm?branch=main#c1b0201d8286cb23b9f30cb16ba435484666cfa3" +dependencies = [ + "bitfield-struct", + "open-enum", + "static_assertions", + "zerocopy", +] + +[[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] @@ -1118,19 +1247,19 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#c5a60508595dc504da469b89102b8b49e91714a9" +source = "git+https://github.com/rust-vmm/mshv?branch=main#af397ea8514303d3a19d21d33730e867f7415ba9" dependencies = [ "libc", "serde", "serde_derive", "vmm-sys-util", - "zerocopy 0.7.1", + "zerocopy", ] [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#c5a60508595dc504da469b89102b8b49e91714a9" +source = "git+https://github.com/rust-vmm/mshv?branch=main#af397ea8514303d3a19d21d33730e867f7415ba9" dependencies = [ "libc", "mshv-bindings", @@ -1198,9 +1327,9 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -1221,10 +1350,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] +name = "open-enum" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9807f1199cf84ec7cc801a79e5ee9aa5178e4762c6b9c7066c30b3cabdcd911e" +dependencies = [ + "open-enum-derive", +] + +[[package]] +name = "open-enum-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "894ae443e59fecf7173ab3b963473f44193fa71b3c8953c61a5bd5f30880bb88" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "openssl-src" -version = "300.1.3+3.1.2" +version = "300.1.5+3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107" +checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" dependencies = [ "cc", ] @@ -1264,9 +1413,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -1318,9 +1467,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pci" @@ -1349,7 +1498,7 @@ dependencies = [ name = "performance-metrics" version = "0.1.0" dependencies = [ - "argh", + "clap", "dirs", "serde", "serde_json", @@ -1568,6 +1717,12 @@ dependencies = [ ] [[package]] +name = "range_map_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8edc89eaa583cf6bc4c6ef16a219f0a60d342ca3bf0eae793560038ac8af1795" + +[[package]] name = "rate_limiter" version = "0.1.0" dependencies = [ @@ -1607,9 +1762,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", @@ -1668,9 +1823,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.21" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25693a73057a1b4cb56179dd3c7ea21a7c6c5ee7d85781f5749b46f34b79c" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", "errno", @@ -1686,7 +1841,7 @@ version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys 0.4.5", @@ -1707,18 +1862,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "seccompiler" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6575e3c2b3a0fe2ef3e53855b6a8dead7c29f783da5e123d378c8c6a89017e" +checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5" dependencies = [ "libc", ] [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" @@ -1764,9 +1919,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.0.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ "serde", "serde_with_macros", @@ -1774,9 +1929,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.0.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling", "proc-macro2", @@ -1790,9 +1945,9 @@ version = "0.1.0" [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -1910,9 +2065,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand 2.0.0", @@ -1931,6 +2086,16 @@ dependencies = [ ] [[package]] +name = "terminal_size" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix 0.37.25", + "windows-sys 0.48.0", +] + +[[package]] name = "test_infra" version = "0.1.0" dependencies = [ @@ -1979,9 +2144,9 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", @@ -2046,9 +2211,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" @@ -2067,6 +2232,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "uuid" version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2188,8 +2359,8 @@ dependencies = [ name = "vhost_user_block" version = "0.1.0" dependencies = [ - "argh", "block", + "clap", "env_logger", "epoll", "libc", @@ -2207,7 +2378,7 @@ dependencies = [ name = "vhost_user_net" version = "0.1.0" dependencies = [ - "argh", + "clap", "env_logger", "epoll", "libc", @@ -2342,10 +2513,11 @@ dependencies = [ "anyhow", "arc-swap", "arch", - "bitflags 2.3.3", + "bitflags 2.4.1", "block", "blocking", "cfg-if", + "clap", "devices", "epoll", "event_monitor", @@ -2383,7 +2555,7 @@ dependencies = [ "vm-virtio", "vmm-sys-util", "zbus", - "zerocopy 0.6.1", + "zerocopy", ] [[package]] @@ -2409,9 +2581,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "wasi" @@ -2491,9 +2663,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -2638,9 +2810,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.9" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" dependencies = [ "memchr", ] @@ -2674,7 +2846,7 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", @@ -2723,40 +2895,19 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.6.1" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236" +checksum = "686b7e407015242119c33dab17b8f61ba6843534de936d94368856528eae4dcc" dependencies = [ "byteorder", - "zerocopy-derive 0.3.2", -] - -[[package]] -name = "zerocopy" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f00a66029e63d181fa590cc5694cf2afbc0974a4604824e80017b1789f99c07" -dependencies = [ - "byteorder", - "zerocopy-derive 0.7.1", -] - -[[package]] -name = "zerocopy-derive" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.1" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c682f46403e5d567cb27b79f6279c145759528ba9450fe371f43b921b452bd" +checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" dependencies = [ "proc-macro2", "quote", diff --git a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index d7182b813107..b1ca5fa1f2a5 100644 --- a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,23 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "35.0"; + version = "36.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HZt5xfsP9l18S6nPyVhLNAs5vgDSVYOMFwThzCCon7E="; + hash = "sha256-SgzohTW0tDn/O65rujZh7hsbvTeu4nQ0HvvXu9f92Vc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "acpi_tables-0.1.0" = "sha256-OGJX05yNwE7zZzATs8y0EZ714+lB+FgSia0TygRwWAU="; + "acpi_tables-0.1.0" = "sha256-FYjzwCSjuTUDCCQPC2ccDpwRRaG1eT5XgV/b8uSu8uc="; + "igvm-0.1.0" = "sha256-l+Qyhdy3b8h8hPLHg5M0os8aSkjM55hAP5nqi0AGmjo="; "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; "micro_http-0.1.0" = "sha256-wX35VsrO1vxQcGbOrP+yZm9vG0gcTZLe7gH7xuAa12w="; - "mshv-bindings-0.1.1" = "sha256-8fEWawNeJ96CczFoJD3cqCsrROEvh8wJ4I0ForwzTJY="; + "mshv-bindings-0.1.1" = "sha256-vyNaKp89THzZ/UpfocEwaCUzCuQnBMyv/icuZEghZEQ="; "versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o="; "vfio-bindings-0.4.0" = "sha256-hGhfOE9q9sf/tzPuaAHOca+JKCutcm1Myu1Tt9spaIQ="; "vfio_user-0.1.0" = "sha256-fAqvy3YTDKXQqtJR+R2nBCWIYe89zTwtbgvJfPLqs1Q="; diff --git a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix index e95e404f82f8..3cfd905bc560 100644 --- a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; + mainProgram = "cntr"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/colima/default.nix b/nixpkgs/pkgs/applications/virtualization/colima/default.nix index 153a22712665..f096b59efc99 100644 --- a/nixpkgs/pkgs/applications/virtualization/colima/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/colima/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "colima"; - version = "0.5.6"; + version = "0.6.5"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Tvh1K/jdJoCHeDO1ckbd793UqB6pn4Qvts3vk8PFTM="; + sha256 = "sha256-lIYLoCFYOwu1iqGgE/jhaqrXAL5ooFHDUnwL56qcGIE="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -35,7 +35,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-IQKfv+bwDQMuDytfYvirBfrmGexj3LGnIQjoJv1NEoU="; + vendorHash = "sha256-7DIhSjHpaCyHyXKhR8KWQc2YGaD8CMq+BZHF4zIkL50="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log @@ -68,5 +68,6 @@ buildGoModule rec { homepage = "https://github.com/abiosoft/colima"; license = licenses.mit; maintainers = with maintainers; [ aaschmid tricktron ]; + mainProgram = "colima"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index d0eceae70525..f929bac673c2 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; + mainProgram = "conmon"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index 1d90b428023b..a0f1f6eca652 100644 --- a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -5,12 +5,12 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "117.0"; + version = "119.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "2ec6c2a0d6700b297bb53803c5065a50f8094c77"; - sha256 = "PFQc6DNbZ6zIXooYKNSHAkHlDvDk09tgRX5KYRiZ2nA="; + rev = "b9977397be2ffc8154bf55983eb21495016d48b5"; + sha256 = "oaCWiyYWQQGERaUPSekUHsO8vaHzIA5ZdSebm/qRR7I="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; - cargoHash = "sha256-yRujLgPaoKx/wkG3yMwQ5ndy9X5xDWSKtCr8DypXvEA="; + cargoHash = "sha256-U/sF/0OWxA41iZsOTao8eeb98lluqOwcPwwA4emcSFc="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 77c36d3f81c0..a2824004a153 100644 --- a/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.11.1"; + version = "1.12"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-D4Y+n/6R2v3U/BhYQitsHd6ckda1vfAzciFbTM/1J80="; + hash = "sha256-61E/71axlN5H1KpAkWFm7jOETlmmy2qh7R+JrVZlMIQ="; fetchSubmodules = true; }; @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ ] ++ teams.podman.members; + mainProgram = "crun"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/ddev/default.nix b/nixpkgs/pkgs/applications/virtualization/ddev/default.nix index 3196c846a2c1..5ea3aa54b2ef 100644 --- a/nixpkgs/pkgs/applications/virtualization/ddev/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.22.4"; + version = "1.22.5"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-ml7SrUmpZubKeDChmNOCHzboR/OBQsr6R8H9peqABek="; + hash = "sha256-s4uRS/BIRjVVN3u+ocy2RcwSnvJLtWpkvxtvgumuWtk="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index 033d6a55d48c..d42319f1915f 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-FPqXfIxuqwsnvsuWN5baIIn6o7ucP/Zgn+OsHfI61zU="; + hash = "sha256-O2oXswExH6OQLDZcgCGF62oZ7v6svZuOziw0SZgOVHI="; }; doCheck = false; diff --git a/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix b/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix index ee61a1bafacc..6c22a5ec1298 100644 --- a/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.marsam ]; platforms = platforms.linux; + mainProgram = "dumb-init"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/firectl/default.nix b/nixpkgs/pkgs/applications/virtualization/firectl/default.nix index 66ab59e58bd8..de0d3cd4131f 100644 --- a/nixpkgs/pkgs/applications/virtualization/firectl/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/firectl/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; + mainProgram = "firectl"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix index 3e0349b5109e..67917b6b02fd 100644 --- a/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix @@ -1,4 +1,5 @@ { lib +, nixosTests , buildGoModule , fetchFromGitHub , iproute2 @@ -7,9 +8,9 @@ , procps }: -buildGoModule rec { +buildGoModule { pname = "gvisor"; - version = "20221102.1"; + 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. @@ -18,11 +19,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff"; - sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o="; + rev = "cdaf5c462c4040ed4cc88989e43f7d373acb9d24"; + hash = "sha256-9d2AJXoGFRCSM6900gOBxNBgL6nxXqz/pPan5EeEdsI="; }; - vendorHash = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU="; + vendorHash = "sha256-QdsVELNcIVsZv2gA05YgQfMZ6hmnfN2GGqW6r+mHqbs="; nativeBuildInputs = [ makeWrapper ]; @@ -39,6 +40,8 @@ buildGoModule rec { 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"; diff --git a/nixpkgs/pkgs/applications/virtualization/kraft/default.nix b/nixpkgs/pkgs/applications/virtualization/kraft/default.nix index 688e6eff949b..e0d7a5a0dd18 100644 --- a/nixpkgs/pkgs/applications/virtualization/kraft/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.6.6"; + version = "0.7.0"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-3dI3F1cCeLEOd+zusWUDZWLrVaaKHXzwOL/mF/yPZC8="; + hash = "sha256-4T108ZMM10evGricLj8S+XYw3NXfUI68KlcraWA+nd0="; }; - vendorHash = "sha256-4zciooCUNVLTQ/0tctqV3hExR5vRY5VumHzGtL8xdws="; + vendorHash = "sha256-qu0GQdjaYXj932KKBphP4CQWsAOssI4+42tPAD3iqik="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix b/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix index 5f365f5c6296..0c2c4d0d0df8 100644 --- a/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; platforms = libkrun.meta.platforms; + mainProgram = "krunvm"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix index 2400c19d40ea..03a162f9b7f1 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.17.2"; + version = "0.18.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 = "c7e328369e6842b15452b440daa5137e00da57ca7aa025b1cf7f80bd5c7843a9"; + sha256 = "6c58ca1b7803c2eeb1eaeb124db57fdc426b45fa65ce41a3fd83856c9be5c233"; }; 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 = "5b8954b3040b82016701091bed4ac99c668ffb8d362dc7a0fdf5cb9a6ed9ebb1"; + sha256 = "e19b1067dcfc7d9d34d692d26b84e2b8589c3b39ac3316efc7b25fa82dcafbc6"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "20df104067f255212cd6df82508961b20bf4c0a16a233a74d495a4b6ee3a62e8"; + sha256 = "1a1113a8e3a6f6f12dd01a7bbf30017d3cccf1ed7705e61c06149d8fab57654e"; }; 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 = "a9af3aec848ed7bc490baff2f1d785334cbbc6cd94f981705cc0aeab833288b0"; + sha256 = "efd100c65173d0dff885e61778fa61737a609fc543d8260b491c8090c000bd3b"; }; }; in diff --git a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index e35a5d16a49d..a896829356b1 100644 --- a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/railwayapp/nixpacks"; license = licenses.mit; maintainers = [ maintainers.zoedsoupe ]; + mainProgram = "nixpacks"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/ops/default.nix b/nixpkgs/pkgs/applications/virtualization/ops/default.nix index 56829737ead9..1181d12c9aec 100644 --- a/nixpkgs/pkgs/applications/virtualization/ops/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ops/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "ops"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix index df73860dda8b..8671617a4043 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix @@ -19,5 +19,6 @@ buildPythonApplication rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; + mainProgram = "podman-compose"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix b/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix index 412db059eac7..80c013becb40 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs , makeWrapper , copyDesktopItems @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn - fixup_yarn_lock + prefetch-yarn-deps nodejs makeWrapper copyDesktopItems @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { export HOME="$TMPDIR" yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ @@ -116,5 +116,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ panda2134 ]; inherit (electron.meta) platforms; + mainProgram = "podman-desktop"; }; }) diff --git a/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix b/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix index e5d5eb930982..3372ea695ef4 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix @@ -45,5 +45,6 @@ buildGoModule rec { description = "Podman Terminal UI"; license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "podman-tui"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock b/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock index c046f6d4a831..d53094fcf9bf 100644 --- a/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock +++ b/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -55,15 +55,14 @@ dependencies = [ [[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 = "ashpd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +version = "0.6.0" +source = "git+https://github.com/bilelmoussaoui/ashpd.git?rev=30216eccd3f4ecb50c4d34a493a33e6eef4e375c#30216eccd3f4ecb50c4d34a493a33e6eef4e375c" dependencies = [ "enumflags2", "futures-channel", @@ -86,7 +85,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -97,7 +96,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -107,80 +106,128 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", ] [[package]] +name = "async-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +dependencies = [ + "async-lock 3.0.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] name = "async-lock" -version = "2.7.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" dependencies = [ - "event-listener", + "event-listener 3.0.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", + "event-listener 3.0.1", + "futures-lite 1.13.0", + "rustix 0.38.21", "windows-sys", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "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.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.21", + "signal-hook-registry", + "slab", + "windows-sys", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -190,9 +237,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -216,6 +263,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -241,30 +294,31 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.8.0", "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log", + "fastrand 2.0.1", + "futures-io", + "futures-lite 1.13.0", + "piper", + "tracing", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -274,17 +328,16 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[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 = "cairo-rs" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cairo-sys-rs", "glib", "libc", @@ -294,9 +347,8 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "glib-sys", "libc", @@ -314,15 +366,18 @@ dependencies = [ [[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 = [ + "libc", +] [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -336,18 +391,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -363,9 +417,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -385,7 +439,7 @@ dependencies = [ "log", "mime", "paste", - "pin-project 1.1.2", + "pin-project 1.1.3", "serde", "serde_json", "tar", @@ -402,9 +456,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -439,6 +493,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -461,31 +524,10 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys", -] - -[[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -493,13 +535,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] @@ -510,26 +552,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" 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 = "error-chain" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -545,6 +576,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.0.1", + "pin-project-lite", +] + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -554,6 +606,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "field-offset" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -565,21 +623,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys", ] [[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", @@ -602,9 +660,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -617,9 +675,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -627,15 +685,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -644,9 +702,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -654,7 +712,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -664,33 +722,43 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -718,11 +786,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -732,9 +798,8 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "gio-sys", "glib-sys", @@ -745,11 +810,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -761,9 +824,8 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -778,9 +840,8 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa73894ed86fe10157436123d8baae5f2924ebc4fa48a11d8f093e07b9ecbbd" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -791,9 +852,8 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41c5a9cd7e06f612b91ec45ecb423ab57921bbd92f56e46a67b962be198e0c" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "glib-sys", "libc", @@ -802,9 +862,8 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17de2c3554d5127b9dfacd4d1801e2e3c9163bce01c6e1c407c054e9b771f2ee" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -815,9 +874,8 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ca6c03d5019467d21671936edeba09f908039900af8ce4b834c19646031c72" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "gdk4-sys", "glib-sys", @@ -837,13 +895,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -868,17 +926,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", @@ -894,9 +950,8 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "glib-sys", "gobject-sys", @@ -907,11 +962,10 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ - "bitflags", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -930,24 +984,21 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ - "anyhow", "heck", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "glib-sys" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "libc", "system-deps", @@ -955,9 +1006,8 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "glib-sys", "libc", @@ -966,9 +1016,8 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "glib", "graphene-sys", @@ -977,9 +1026,8 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "glib-sys", "libc", @@ -989,11 +1037,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ - "bitflags", "cairo-rs", "gdk4", "glib", @@ -1005,9 +1051,8 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1021,11 +1066,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ - "bitflags", "cairo-rs", "field-offset", "futures-channel", @@ -1038,18 +1081,16 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", @@ -1058,9 +1099,8 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +version = "0.8.0" +source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1077,15 +1117,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1095,9 +1129,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1136,11 +1170,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "fnv", "itoa", ] @@ -1151,7 +1185,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "http", "pin-project-lite", ] @@ -1164,9 +1198,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -1174,7 +1208,7 @@ version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures-channel", "futures-core", "futures-util", @@ -1184,7 +1218,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1200,22 +1234,22 @@ dependencies = [ "futures-util", "hex", "hyper", - "pin-project 1.1.2", + "pin-project 1.1.3", "tokio", ] [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1239,23 +1273,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown", + "serde", ] [[package]] @@ -1290,15 +1314,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -1314,12 +1338,9 @@ dependencies = [ [[package]] name = "libadwaita" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" +version = "0.6.0" +source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#24608c684b8fa59357d0d586fde75c04a464cbf6" dependencies = [ - "bitflags", - "futures-channel", "gdk-pixbuf", "gdk4", "gio", @@ -1327,15 +1348,13 @@ dependencies = [ "gtk4", "libadwaita-sys", "libc", - "once_cell", "pango", ] [[package]] name = "libadwaita-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" +version = "0.6.0" +source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#24608c684b8fa59357d0d586fde75c04a464cbf6" dependencies = [ "gdk4-sys", "gio-sys", @@ -1349,36 +1368,35 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libpanel" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5313f06d37cb94e7a54ce3eb8a706e0263c8ed718671d6c775e3935f23abd7a" +version = "0.3.0" +source = "git+https://gitlab.gnome.org/World/Rust/libpanel-rs.git#7dd6d088f92079893f0e5d2afc2c8258b807ddcd" dependencies = [ "futures-core", "gdk4", "gio", "glib", "gtk4", + "libadwaita", + "libc", "libpanel-sys", - "once_cell", ] [[package]] name = "libpanel-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a80572ca80bb4d578cbc1ffe4d848c59815fc567fd67c5a64f2bf53ad78dc0e" +version = "0.3.0" +source = "git+https://gitlab.gnome.org/World/Rust/libpanel-rs.git#7dd6d088f92079893f0e5d2afc2c8258b807ddcd" dependencies = [ "gdk4-sys", "gio-sys", @@ -1397,6 +1415,12 @@ 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 = "locale_config" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1411,9 +1435,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" @@ -1432,9 +1456,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1471,12 +1495,12 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -1491,15 +1515,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "static_assertions", ] [[package]] @@ -1518,9 +1541,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", @@ -1547,9 +1570,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -1589,9 +1612,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", ] @@ -1646,9 +1669,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1661,16 +1684,15 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oo7" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1007a6c292751abc192f8dbeef8341bac074e991be7b0eb27a6aece5ee79b4dd" +checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" dependencies = [ "aes", "byteorder", "cbc", "cipher", "digest", - "dirs", "futures-util", "hkdf", "hmac", @@ -1687,12 +1709,6 @@ dependencies = [ ] [[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] name = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1704,11 +1720,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ - "bitflags", "gio", "glib", "libc", @@ -1718,9 +1732,8 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +version = "0.19.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" dependencies = [ "glib-sys", "gobject-sys", @@ -1730,15 +1743,15 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -1767,11 +1780,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "pin-project-internal 1.1.2", + "pin-project-internal 1.1.3", ] [[package]] @@ -1787,20 +1800,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1809,6 +1822,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1821,7 +1845,7 @@ source = "git+https://github.com/vv9k/podman-api-rs.git#f35e6f9f9fdb9d9023aed341 dependencies = [ "base64", "byteorder", - "bytes 1.4.0", + "bytes 1.5.0", "containers-api", "flate2", "futures-util", @@ -1850,19 +1874,18 @@ dependencies = [ [[package]] name = "pods" -version = "1.2.3" +version = "2.0.0" dependencies = [ "anyhow", "ashpd", "futures", "gettext-rs", "gtk4", - "indexmap 1.9.3", + "indexmap", "libadwaita", "libpanel", "log", "names", - "once_cell", "oo7", "paste", "podman-api", @@ -1883,7 +1906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -1893,6 +1916,26 @@ dependencies = [ ] [[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys", +] + +[[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" @@ -1905,7 +1948,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -1934,18 +1986,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1982,38 +2034,27 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "redox_syscall" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2023,9 +2064,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2034,9 +2075,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustc-demangle" @@ -2055,55 +2096,68 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", "windows-sys", ] [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[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" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.102" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2112,29 +2166,29 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -2143,9 +2197,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2153,16 +2207,6 @@ dependencies = [ ] [[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2173,36 +2217,44 @@ 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.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", ] [[package]] -name = "sourceview5" -version = "0.6.1" +name = "socket2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee960607b1f7fda934dce68e76e925989ebe186ac04d6ab5ea9ce93e13835c03" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "sourceview5" +version = "0.8.0" +source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git#5baec2e87544136de6c3e1a3614624d60986d530" dependencies = [ - "bitflags", "futures-channel", "futures-core", "gdk-pixbuf", @@ -2217,9 +2269,8 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a23462cd3d696199b56317d35e69b240d655b8c70c12bd8f443b672313776c" +version = "0.8.0" +source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git#5baec2e87544136de6c3e1a3614624d60986d530" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -2263,9 +2314,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.25" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -2282,14 +2333,14 @@ dependencies = [ "hostname", "libc", "log", - "time 0.3.23", + "time", ] [[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck", @@ -2300,9 +2351,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -2311,9 +2362,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.9" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "temp-dir" @@ -2323,58 +2374,48 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "autocfg", "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "time" -version = "0.1.45" +version = "0.3.30" 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" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -2382,15 +2423,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -2412,19 +2453,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", "backtrace", - "bytes 1.4.0", + "bytes 1.5.0", "libc", "mio", "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.5", "tracing", "windows-sys", ] @@ -2442,47 +2482,68 @@ dependencies = [ [[package]] name = "tokio-tar" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50188549787c32c1c3d9c8c71ad7e003ccf2f102489c5a96e385c84760477f4" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" dependencies = [ "filetime", "futures-core", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "tokio", "tokio-stream", - "xattr", ] [[package]] name = "toml" -version = "0.7.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.13" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8751d9c1b03c6500c387e96f81f815a4f8e72d142d2d4a9ffa6fedd51ddee7" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap", + "toml_datetime", + "winnow", +] + +[[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", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -2497,11 +2558,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2509,20 +2569,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -2535,9 +2595,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" @@ -2557,9 +2617,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -2572,9 +2632,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2602,9 +2662,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vte" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +checksum = "98b0a06c0f086f7abe70cf308967153479e223b6a9809f7dcc6c47b045574bc9" dependencies = [ "utf8parse", "vte_generate_state_changes", @@ -2612,11 +2672,10 @@ dependencies = [ [[package]] name = "vte4" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58204be19a32d0925cb4faf05339c769ba699f66471f1f53af1fdecd7125a64b" +version = "0.8.0" +source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#aa466f43ead6190c6c4b8792f78ed766df1c289e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk4", "gio", "glib", @@ -2629,9 +2688,8 @@ dependencies = [ [[package]] name = "vte4-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b85a2b09ffbb8acf8147b39ceeb88b0fec74dfad26880004b5f6cb8ffce47" +version = "0.8.0" +source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#aa466f43ead6190c6c4b8792f78ed766df1c289e" dependencies = [ "gdk4-sys", "gio-sys", @@ -2654,9 +2712,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "want" @@ -2669,21 +2727,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2691,24 +2743,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2716,22 +2768,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "winapi" @@ -2756,10 +2808,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -2775,9 +2827,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2790,60 +2842,60 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] @@ -2871,7 +2923,7 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", @@ -2900,7 +2952,7 @@ version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -2936,7 +2988,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] @@ -2960,7 +3012,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/nixpkgs/pkgs/applications/virtualization/pods/default.nix b/nixpkgs/pkgs/applications/virtualization/pods/default.nix index 1e50f157adcf..8ab437780705 100644 --- a/nixpkgs/pkgs/applications/virtualization/pods/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/pods/default.nix @@ -19,19 +19,26 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.2.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NeIrEr6judTR5zHhhboUncx953hEjIl0qVaWkMVNiU="; + sha256 = "sha256-jSN4WmyzYARhDkwAtTYD4iXNTM1QQbAAwQ/ICHg7k3k="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { + "ashpd-0.6.0" = "sha256-kLacOwMZ4MQlFYCx5J4kI4J+a9fVRF5Ii/AkWOL/TNQ="; + "cairo-rs-0.19.0" = "sha256-8s+ngacR7d2wb1FKYf0pycxMQbgW63zMKpMgaUs2e+c="; + "gdk4-0.8.0" = "sha256-o9HC4VX6ntPk0JXAX5Whhu0qlUdpPky/1PNrRd9zjdk="; + "libadwaita-0.6.0" = "sha256-3Kge7SIE+vex/uOIt7hjmU68jidkBjrW96o24hu3e/U="; + "libpanel-0.3.0" = "sha256-LA8ynd+7imEdQwvLslmKw+pPNbAEle9fZ2sFuyRY/jU="; "podman-api-0.10.0" = "sha256-nbxK/U5G+PlbytpHdr63x/C69hBgedPXBFfgdzT9fdc="; + "sourceview5-0.8.0" = "sha256-+f+mm682H4eRC7Xzx5wukecDZq+hMpJQ3+3xHzG00Go="; + "vte4-0.8.0" = "sha256-KZBpfSAngbp5czAXdKA7Au5uYqs2L5MyNsnXcBH77lo="; }; }; @@ -63,5 +70,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; platforms = platforms.linux; + mainProgram = "pods"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 0dc91af767f5..1dc000c3f41e 100644 --- a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-VBUmp2RXbrSU0v9exGrrJT5i6ikDXRwjwKivTmzU8Ic="; + hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] diff --git a/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix index 9568a0bb695c..d8fda62ccf90 100644 --- a/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix @@ -41,5 +41,6 @@ mkDerivation rec { license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ romildo ]; + mainProgram = "qtemu"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix index fa4f105f6e83..3e7c50690896 100644 --- a/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { client which is able to manage a VirtualBox server installation. ''; platforms = platforms.all; + mainProgram = "remotebox"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 67edd6887c90..a17c5753981f 100644 --- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -56,5 +56,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ offline ] ++ teams.podman.members; platforms = platforms.linux; + mainProgram = "runc"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 67ea1e07b908..286a521be054 100644 --- a/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -67,5 +67,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 ]; maintainers = with maintainers; [ astro ]; platforms = [ "x86_64-none" ]; + mainProgram = "hypervisor-fw"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix b/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix index b1b03d09680f..b6eaea8d7597 100644 --- a/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3 /* or */ mpl20 ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; + mainProgram = "rvvm"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix b/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix index 3b110d9bc991..9f17dc8eb03d 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix @@ -71,6 +71,8 @@ in , newuidmapPath ? null # Path to SUID-ed newgidmap executable , newgidmapPath ? null + # External LOCALSTATEDIR +, externalLocalStateDir ? null # Remove the symlinks to `singularity*` when projectName != "singularity" , removeCompat ? false # Workaround #86349 @@ -106,6 +108,7 @@ in inherit enableSeccomp enableSuid + externalLocalStateDir projectName removeCompat starterSuidPath @@ -141,7 +144,7 @@ in configureScript = "./mconfig"; configureFlags = [ - "--localstatedir=/var/lib" + "--localstatedir=${if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib"}" "--runstatedir=/var/run" ] ++ lib.optional (!enableSeccomp) "--without-seccomp" diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix b/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix index 8a86f06785b4..80e7d2c2a39f 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix @@ -7,14 +7,14 @@ let apptainer = callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.2.4"; + version = "1.2.5"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-VaVOepfjMBf8F56S1Clpn8HPw65MNQMoZsQguKQ4Sg0="; + hash = "sha256-1XuqyNXyYrmIfqp8450z8+qET15hKVfj2v2iN9QPmDk="; }; # Update by running diff --git a/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix b/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix index 75641547ad2e..d927c8430a1e 100644 --- a/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mulan-psl2; maintainers = with maintainers; [ astro ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; + mainProgram = "stratovirt"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/tart/default.nix b/nixpkgs/pkgs/applications/virtualization/tart/default.nix index ae1130fd146d..cc924278b9aa 100644 --- a/nixpkgs/pkgs/applications/virtualization/tart/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.0.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - sha256 = "sha256-uDNB49HF++WTV28VkfZCt32zkp+h0W5xXAuqtaFTmPI="; + sha256 = "sha256-LdzP0Vovda0W6uBg71dJlTxP+Qly+c2Shv3xrMmxYDg="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/applications/virtualization/tini/default.nix b/nixpkgs/pkgs/applications/virtualization/tini/default.nix index 2df0978b0d0a..9eeb8134f595 100644 --- a/nixpkgs/pkgs/applications/virtualization/tini/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/tini/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/krallin/tini"; license = licenses.mit; platforms = platforms.linux; + mainProgram = "tini"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix b/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix index 94928ff35733..75b7f41c7e78 100644 --- a/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix @@ -47,5 +47,6 @@ buildGoModule rec { description = "Tool for containerized command line environments on Linux"; license = licenses.asl20; maintainers = with maintainers; [ urandom ]; + mainProgram = "toolbox"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/umoci/default.nix b/nixpkgs/pkgs/applications/virtualization/umoci/default.nix index 627817139c8c..5dc9ae5028e8 100644 --- a/nixpkgs/pkgs/applications/virtualization/umoci/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/umoci/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://umo.ci"; license = licenses.asl20; maintainers = with maintainers; [ zokrezyl ]; + mainProgram = "umoci"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix index dc6f79d6a7e5..5ad60bf7d080 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "virt-top"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix index 18d65480138c..e11b265a9e3c 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "virt-what"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/virter/default.nix b/nixpkgs/pkgs/applications/virtualization/virter/default.nix index 6a0b94999000..01cfe07da8ab 100644 --- a/nixpkgs/pkgs/applications/virtualization/virter/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virter/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { homepage = "https://github.com/LINBIT/virter"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dit7ya ]; + mainProgram = "virter"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index f6612f3d9aea..840c9d648b94 100644 --- a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; + mainProgram = "x11docker"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/youki/default.nix b/nixpkgs/pkgs/applications/virtualization/youki/default.nix index a179b4568a7f..93355b74b472 100644 --- a/nixpkgs/pkgs/applications/virtualization/youki/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/youki/default.nix @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; maintainers = []; platforms = platforms.linux; + mainProgram = "youki"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix b/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix index 1f07da0a7bc4..f070b1fd062c 100644 --- a/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ berbiche ]; platforms = platforms.linux; changelog = "https://github.com/project-repo/cagebreak/blob/${version}/Changelog.md"; + mainProgram = "cagebreak"; }; passthru.tests.basic = nixosTests.cagebreak; diff --git a/nixpkgs/pkgs/applications/window-managers/cwm/default.nix b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix index ac5353daeb23..5560a04dcd61 100644 --- a/nixpkgs/pkgs/applications/window-managers/cwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ _0x4A6F mkf ]; license = licenses.isc; platforms = platforms.linux; + mainProgram = "cwm"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/nixpkgs/pkgs/applications/window-managers/dwl/default.nix index e4578319ee07..dc2f58b1d3a8 100644 --- a/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.AndersonTorres ]; inherit (wayland.meta) platforms; + mainProgram = "dwl"; }; }) # TODO: custom patches from upstream website diff --git a/nixpkgs/pkgs/applications/window-managers/dwm/default.nix b/nixpkgs/pkgs/applications/window-managers/dwm/default.nix index a09790070772..24b011040ae4 100644 --- a/nixpkgs/pkgs/applications/window-managers/dwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/dwm/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ viric neonfuz ]; platforms = platforms.all; + mainProgram = "dwm"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/evilwm/default.nix b/nixpkgs/pkgs/applications/window-managers/evilwm/default.nix index 0855e512fd8e..0578be8ed6c7 100644 --- a/nixpkgs/pkgs/applications/window-managers/evilwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/evilwm/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { }; # like BSD/MIT, but Share-Alike'y; See README. maintainers = with maintainers; [ amiloradovsky ]; platforms = platforms.all; + mainProgram = "evilwm"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix b/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix index d056005e8f52..addebf13ec65 100644 --- a/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.mit; + mainProgram = "fbpanel"; }; passthru = { diff --git a/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix b/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix index e9edd10b2539..99ecf86e20a1 100644 --- a/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix @@ -130,5 +130,6 @@ stdenv.mkDerivation { license = licenses.bsd2; maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli ]; platforms = platforms.linux; + mainProgram = "gamescope"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 80308ee138f8..0da20adbbced 100644 --- a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-V5ulB9CkGh1ghiC4BKvRdoYKZzpaiOKzAOUmJIFkgM0="; + hash = "sha256-tcHtiyDtLky3lBk5cTmpHRSSbo1IjqOwf+q6Lofz5qM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 4657ab2464c7..6a067878f22f 100644 --- a/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-IKcRTKzlcDsbD5xydRNc9s4c4KjcQHaZgOc5kWPOAtU="; + hash = "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix b/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix index 754163547e76..dfc0974834f4 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "i3-auto-layout"; - version = "0.2"; + version = "unstable-2022-05-29"; src = fetchFromGitHub { owner = "chmln"; repo = pname; - rev = "v${version}"; - sha256 = "0ps08lga6qkgc8cgf5cx2lgwlqcnd2yazphh9xd2fznnzrllfxxz"; + rev = "9e41eb3891991c35b7d35c9558e788899519a983"; + sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs="; }; - cargoSha256 = "1i01kqvsykanzs7pi94gab9k2dqg1ki40mmjrwa22n0ypkbnvsmx"; + cargoSha256 = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { description = "Automatic, optimal tiling for i3wm"; homepage = "https://github.com/chmln/i3-auto-layout"; license = licenses.mit; - maintainers = with maintainers; [ mephistophiles ]; + maintainers = with maintainers; [ mephistophiles perstark ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/i3/bumblebee-status/default.nix b/nixpkgs/pkgs/applications/window-managers/i3/bumblebee-status/default.nix new file mode 100644 index 000000000000..9583d71052bb --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/i3/bumblebee-status/default.nix @@ -0,0 +1,67 @@ +{ pkgs +, lib +, glibcLocales +, python +, fetchFromGitHub + # Usage: bumblebee-status.override { plugins = p: [p.arandr p.bluetooth2]; }; +, plugins ? p: [ ] +}: +let + version = "2.2.0"; + + # { <name> = { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } } + allPlugins = + lib.mapAttrs + (name: value: value // { inherit name; }) + (import ./plugins.nix { inherit pkgs python; }); + + # [ { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } ] + selectedPlugins = plugins allPlugins; +in +python.pkgs.buildPythonPackage { + pname = "bumblebee-status"; + inherit version; + + src = fetchFromGitHub { + owner = "tobi-wan-kenobi"; + repo = "bumblebee-status"; + rev = "v${version}"; + hash = "sha256-+RCg2XZv0AJnexi7vnQhEXB1qSoKBN1yKWm3etdys1s="; + }; + + buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins; + propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins; + + checkInputs = with python.pkgs; [ freezegun netifaces psutil pytest pytest-mock requests ]; + + checkPhase = '' + runHook preCheck + + # Fixes `locale.Error: unsupported locale setting` in some tests. + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"; + + # FIXME: We skip the `dunst` module tests, some of which fail with + # `RuntimeError: killall -s SIGUSR2 dunst not found`. + # This is not solved by adding `pkgs.killall` to `checkInputs`. + ${python.interpreter} -m pytest -k 'not test_dunst.py' + + runHook postCheck + ''; + + postInstall = '' + # Remove binary cache files + find $out -name "__pycache__" -type d | xargs rm -rv + + # Make themes available for bumblebee-status to detect them + cp -r ./themes $out/${python.sitePackages} + ''; + + meta = with lib; { + description = "A modular, theme-able status line generator for the i3 window manager"; + homepage = "https://github.com/tobi-wan-kenobi/bumblebee-status"; + mainProgram = "bumblebee-status"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ augustebaum ]; + }; +} diff --git a/nixpkgs/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/nixpkgs/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix new file mode 100644 index 000000000000..6a1dda584207 --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix @@ -0,0 +1,162 @@ +{ pkgs +, python +, ... +}: +# propagatedBuildInputs are for Python libraries and executables +# buildInputs are for libraries +let + py = python.pkgs; +in +{ + amixer.propagatedBuildInputs = [ pkgs.alsa-utils ]; + # aptitude is unpackaged + # apt.propagatedBuildInputs = [aptitude]; + arandr.propagatedBuildInputs = [ py.tkinter pkgs.arandr pkgs.xorg.xrandr ]; + # checkupdates is unpackaged + # arch-update.propagatedBuildInputs = [checkupdates]; + # checkupdates is unpackaged + # arch_update.propagatedBuildInputs = [checkupdates]; + # yay is unpackaged + # aur-update.propagatedBuildInputs = [yay]; + battery = { }; + battery-upower = { }; + battery_upower = { }; + bluetooth.propagatedBuildInputs = [ pkgs.bluez pkgs.blueman pkgs.dbus ]; + bluetooth2.propagatedBuildInputs = [ pkgs.bluez pkgs.blueman pkgs.dbus py.dbus-python ]; + blugon.propagatedBuildInputs = [ pkgs.blugon ]; + # If you do not allow this plugin to query the system's ACPI, i.e. the plugin option `use_acpi` is set to `False`, then you need at least one of [ brightnessctl light xbacklight ] + brightness.propagatedBuildInputs = [ ]; + caffeine.propagatedBuildInputs = [ pkgs.xdg-utils pkgs.xdotool pkgs.xorg.xprop pkgs.libnotify ]; + cmus.propagatedBuildInputs = [ pkgs.cmus ]; + cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome.gnome-system-monitor ]; + cpu2.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; + cpu3.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; + currency.propagatedBuildInputs = [ py.requests ]; + date = { }; + datetime = { }; + datetimetz.propagatedBuildInputs = [ py.tzlocal py.pytz ]; + datetz = { }; + deadbeef.propagatedBuildInputs = [ pkgs.deadbeef ]; + debug = { }; + deezer.propagatedBuildInputs = [ py.dbus-python ]; + disk = { }; + # dnf is unpackaged + # dnf.propagatedBuildInputs = [dnf]; + docker_ps.propagatedBuildInputs = [ py.docker ]; + dunst.propagatedBuildInputs = [ pkgs.dunst ]; + dunstctl.propagatedBuildInputs = [ pkgs.dunst ]; + # emerge is unpackaged + # emerge_status.propagatedBuildInputs = [emerge]; + error = { }; + gcalendar.propagatedBuildInputs = [ + py.google-api-python-client + py.google-auth-httplib2 + py.google-auth-oauthlib + ]; + getcrypto.propagatedBuildInputs = [ py.requests ]; + git.propagatedBuildInputs = [ pkgs.xcwd pkgs.pygit2 ]; + github.propagatedBuildInputs = [ py.requests ]; + gitlab.propagatedBuildInputs = [ py.requests ]; + # gpmdp-remote is unpackaged + # gpmdp.propagatedBuildInputs = [gpmdp-remote]; + hddtemp = { }; + hostname = { }; + http_status = { }; + indicator.propagatedBuildInputs = [ pkgs.xorg.xset ]; + kernel = { }; + keys = { }; + # python3Packages.xkbgroup is unpackaged + layout = { + buildInputs = [ pkgs.xorg.libX11 ]; + # propagatedBuildInputs = [py.xkbgroup]; + }; + # python3Packages.xkbgroup is unpackaged + layout-xkb = { + buildInputs = [ pkgs.xorg.libX11 ]; + # propagatedBuildInputs = [py.xkbgroup]; + }; + layout-xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; + # python3Packages.xkbgroup is unpackaged + # NOTE: Yes, there is also a plugin named `layout-xkb` with a dash. + layout_xkb = { + buildInputs = [ pkgs.xorg.libX11 ]; + # propagatedBuildInputs = [python3Packages.xkbgroup]; + }; + # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. + layout_xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; + libvirtvms.propagatedBuildInputs = [ py.libvirt ]; + load.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; + memory.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; + messagereceiver = { }; + mocp.propagatedBuildInputs = [ pkgs.moc ]; + mpd.propagatedBuildInputs = [ pkgs.mpc-cli ]; + network.propagatedBuildInputs = [ py.netifaces pkgs.iw ]; + network_traffic.propagatedBuildInputs = [ py.netifaces ]; + nic.propagatedBuildInputs = [ py.netifaces pkgs.iw ]; + notmuch_count.propagatedBuildInputs = [ pkgs.notmuch ]; + # nvidian-smi is unpackaged + # nvidiagpu.propagatedBuildInputs = [nvidia-smi]; + octoprint.propagatedBuildInputs = [ py.tkinter ]; + # optimus-manager is unpackaged + # optman.propagatedBuildInputs = [optimus-manager]; + pacman.propagatedBuildInputs = [ pkgs.fakeroot pkgs.pacman ]; + pamixer.propagatedBuildInputs = [ pkgs.pamixer ]; + persian_date.propagatedBuildInputs = [ py.jdatetime ]; + pihole = { }; + ping.propagatedBuildInputs = [ pkgs.iputils ]; + pipewire.buildInputs = [ pkgs.wireplumber ]; + playerctl.propagatedBuildInputs = [ pkgs.playerctl ]; + pomodoro = { }; + # emerge is unpackaged + # portage_status.propagatedBuildInputs = [emerge]; + # prime-select is unpackaged + # prime.propagatedBuildInputs = [prime-select]; + progress.propagatedBuildInputs = [ pkgs.progress ]; + publicip.propagatedBuildInputs = [ py.netifaces ]; + # Deprecated in favor of pulsectl + # pulseaudio = {}; + pulsectl.propagatedBuildInputs = [ pkgs.pulsectl ]; + redshift.propagatedBuildInputs = [ pkgs.redshift ]; + # rofication is unpackaged + # rofication.propagatedBuildInputs = [rofication]; + rotation.propagatedBuildInputs = [ pkgs.xorg.xrandr ]; + rss = { }; + sensors.propagatedBuildInputs = [ pkgs.lm_sensors ]; + sensors2.propagatedBuildInputs = [ pkgs.lm_sensors ]; + shell = { }; + shortcut = { }; + smartstatus.propagatedBuildInputs = [ pkgs.smartmontools ]; + solaar.propagatedBuildInputs = [ pkgs.solaar ]; + spaceapi.propagatedBuildInputs = [ py.requests ]; + spacer = { }; + speedtest.propagatedBuildInputs = [ py.speedtest-cli ]; + spotify.propagatedBuildInputs = [ py.dbus-python ]; + stock = { }; + # suntime is not packaged yet + # sun.propagatedBuildInputs = [ py.requests python-dateutil suntime ]; + system.propagatedBuildInputs = [ py.tkinter ]; + taskwarrior.propagatedBuildInputs = [ py.taskw ]; + test = { }; + thunderbird = { }; + time = { }; + timetz = { }; + title.propagatedBuildInputs = [ py.i3ipc ]; + todo = { }; + todo_org = { }; + todoist.propagatedBuildInputs = [ py.requests ]; + traffic = { }; + # Needs `systemctl` + twmn.propagatedBuildInputs = [ ]; + uptime = { }; + usage.propagatedBuildInputs = [ py.sqlite pkgs.activitywatch ]; + vault.propagatedBuildInputs = [ pkgs.pass ]; + vpn.propagatedBuildInputs = [ py.tkinter pkgs.networkmanager ]; + wakatime.propagatedBuildInputs = [ py.requests ]; + watson.propagatedBuildInputs = [ pkgs.watson ]; + weather.propagatedBuildInputs = [ py.requests ]; + xkcd = { }; + # i3 is optional + xrandr.propagatedBuildInputs = [ pkgs.xorg.xrandr ]; + yubikey.propagatedBuildInputs = [ pkgs.yubico ]; + zpool = { }; +} diff --git a/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index c33856214f33..06c3de8cd3fa 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -11,20 +11,21 @@ , lm_sensors , iw , iproute2 +, withICUCalendar ? false }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.32.2"; + version = "0.32.3"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CKL4XsOBo8y4k06t5E7k2HBmI4VABW4rxU6Bjl52fhs="; + hash = "sha256-CldVak1BQ4VhRt24hHdog5O3crkQBZBkRWNT7uYUw4Y="; }; - cargoHash = "sha256-7v5813veJPP5NVe2gFZr+iXJmK+aLajSZuhEkgsMxuY="; + cargoHash = "sha256-gWBmzpgZcsO4u8kXSqtr4FIYvshXpxWbECg/tcyl9Ok="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -34,7 +35,7 @@ rustPlatform.buildRustPackage rec { "notmuch" "maildir" "pulseaudio" - ]; + ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ]); prePatch = '' substituteInPlace src/util.rs \ diff --git a/nixpkgs/pkgs/applications/window-managers/jay/default.nix b/nixpkgs/pkgs/applications/window-managers/jay/default.nix index 1b58fa0f2c89..6718caf1ada2 100644 --- a/nixpkgs/pkgs/applications/window-managers/jay/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/jay/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "jay"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/jwm/default.nix b/nixpkgs/pkgs/applications/window-managers/jwm/default.nix index 18df9da344d4..9456449405a8 100644 --- a/nixpkgs/pkgs/applications/window-managers/jwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/jwm/default.nix @@ -79,5 +79,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; + mainProgram = "jwm"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix b/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix index 2fbc37d8e7eb..0692780a549d 100644 --- a/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/kbdd/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ ]; + mainProgram = "kbdd"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix b/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix index 0d8436dcb3ed..d5763a0489f1 100644 --- a/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ meisternu moni ]; license = licenses.mit; platforms = platforms.linux; + mainProgram = "lemonbar"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/lesbar/default.nix b/nixpkgs/pkgs/applications/window-managers/lesbar/default.nix index 791f61c4670a..553e79f9e6dc 100644 --- a/nixpkgs/pkgs/applications/window-managers/lesbar/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/lesbar/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ jpentland ]; platforms = platforms.linux; + mainProgram = "lesbar"; }; }) diff --git a/nixpkgs/pkgs/applications/window-managers/lwm/default.nix b/nixpkgs/pkgs/applications/window-managers/lwm/default.nix index cf1088c82231..1a2e388bdc34 100644 --- a/nixpkgs/pkgs/applications/window-managers/lwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/lwm/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + mainProgram = "lwm"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/miriway/default.nix b/nixpkgs/pkgs/applications/window-managers/miriway/default.nix index 209a2250f032..da97973fa15e 100644 --- a/nixpkgs/pkgs/applications/window-managers/miriway/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2023-08-30"; + version = "unstable-2023-11-22"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "2c9a0599e1a9b37f2a73a245eacce307a3e5b883"; - hash = "sha256-VCLl4GyUmzcC/OEfxXV0bI/6lxLP9eIAAOIjANEI1d8="; + rev = "7d324c3d890b745a1d470ce085d91aaedf0fc6cf"; + hash = "sha256-/pA24HSDco2uavIKb7t5DfGHwO7E/NANvLUMwZqnpQY="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix b/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix index 49133ef5344f..e2986159b20a 100644 --- a/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; maintainers = [ maintainers.j0hax ]; + mainProgram = "mlvwm"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix index 36e6322462da..bb6615b70860 100644 --- a/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix @@ -84,5 +84,6 @@ stdenv.mkDerivation rec { for X11, focused on delivering frames from the window to the framebuffer as quickly as possible. ''; + mainProgram = "neocomp"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/nimdow/default.nix b/nixpkgs/pkgs/applications/window-managers/nimdow/default.nix deleted file mode 100644 index 3d54d8f8de58..000000000000 --- a/nixpkgs/pkgs/applications/window-managers/nimdow/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, nimPackages, libX11, libXft, libXinerama }: -nimPackages.buildNimPackage rec { - pname = "nimdow"; - - version = "0.7.37"; - - src = fetchFromGitHub { - owner = "avahe-kellenberger"; - repo = pname; - rev = "v${version}"; - hash = "sha256-930wDS0UW65QzpUHHOuM25oi/OhFmG0Q7N05ftu7XlI="; - }; - - - buildInputs = with nimPackages; [ parsetoml x11 safeseq safeset libX11 libXft libXinerama ]; - - postInstall = '' - install -D config.default.toml $out/share/nimdow/config.default.toml - install -D nimdow.desktop $out/share/applications/nimdow.desktop - ''; - - postPatch = '' - substituteInPlace src/nimdowpkg/config/configloader.nim --replace "/usr/share/nimdow" "$out/share/nimdow" - ''; - - - - doCheck = true; - - meta = with lib; - src.meta // { - description = "Nim based tiling window manager"; - license = [ licenses.gpl2 ]; - maintainers = [ maintainers.marcusramberg ]; - }; -} diff --git a/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index 6f323b963e4c..9e009e1f128c 100644 --- a/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-4LsB/7zKRkoxNQQVxwrSSIqGP7KQ0WHBnSVY+ClWTxo="; + sha256 = "sha256-t+1MYfsz7KqsMvN8TyLIUrTLTQPWQQpOSk/ysxgE7kg="; }; nativeBuildInputs = [ @@ -138,5 +138,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ masipcat tomfitzhenry zhaofengli ]; platforms = platforms.linux; + mainProgram = "phosh-session"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/river/default.nix b/nixpkgs/pkgs/applications/window-managers/river/default.nix index e149bdd65218..4c59222d31bb 100644 --- a/nixpkgs/pkgs/applications/window-managers/river/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/river/default.nix @@ -14,14 +14,14 @@ , wayland-protocols , wlroots_0_16 , xwayland -, zig_0_10 +, zig_0_11 , withManpages ? true , xwaylandSupport ? true }: stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.2.4"; + version = "0.2.6"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: { repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; + hash = "sha256-JPb8l5ANxYCqinWNoQK5PAyn4CaiSj0e9mAhZwd9HOw="; }; nativeBuildInputs = [ pkg-config wayland xwayland - zig_0_10.hook + zig_0_11.hook ] ++ lib.optional withManpages scdoc; diff --git a/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix b/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix index 4df306eec9c0..12c2e5da1b98 100644 --- a/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ qyliss ]; license = licenses.bsd3; platforms = platforms.linux; + mainProgram = "sommelier"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix index 7c4a1faddb31..2bb5aca9d91c 100644 --- a/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, xorg }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "spectrwm"; - version = "unstable-2023-05-07"; + version = "3.5.1"; src = fetchFromGitHub { owner = "conformal"; repo = "spectrwm"; - rev = "06e3733175969c307a6fd47240a7a37b29d60513"; - sha256 = "QcEwFg9QTi+cCl2JghKOzEZ19LP/ZFMbZJAMJ0BLH9M="; + rev = "SPECTRWM_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; + hash = "sha256-Nlzo35OsNqFbR6nl3nnGXDWmwc8JlP4tyDuIGtKTnIY="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; - maintainers = with maintainers; [ christianharke ]; + maintainers = with maintainers; [ rake5k ]; license = licenses.isc; platforms = platforms.all; @@ -45,4 +45,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix b/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix index 5cd0f7569caa..45160d65dbc6 100644 --- a/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; + mainProgram = "stalonetray"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix index c5c3d9db783e..c776e66da886 100644 --- a/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; + mainProgram = "stumpish"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/sway/assign-cgroups.nix b/nixpkgs/pkgs/applications/window-managers/sway/assign-cgroups.nix new file mode 100644 index 000000000000..c6029de3ee80 --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/sway/assign-cgroups.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "assign-cgroups"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "alebastr"; + repo = "sway-systemd"; + rev = "v${version}"; + sha256 = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; + }; + format = "other"; + + propagatedBuildInputs = with python3Packages; [ dbus-next i3ipc psutil tenacity xlib ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp src/assign-cgroups.py $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + description = "Place GUI applications into systemd scopes for systemd-oomd compatibility."; + longDescription = '' + Automatically assign a dedicated systemd scope to the GUI applications + launched in the same cgroup as the compositor. This could be helpful for + implementing cgroup-based resource management and would be necessary when + `systemd-oomd` is in use. + + Limitations: The script is using i3ipc window:new event to detect application + launches and would fail to detect background apps or special surfaces. + Therefore it's recommended to supplement the script with use of systemd user + services for such background apps. + ''; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/nixpkgs/pkgs/applications/window-managers/sway/fx.nix b/nixpkgs/pkgs/applications/window-managers/sway/fx.nix index 02afaba70774..d8ca9cfb7f48 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/fx.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/fx.nix @@ -27,9 +27,10 @@ sway-unwrapped.overrideAttrs (oldAttrs: rec { meta = with lib; { description = "Sway, but with eye candy!"; homepage = "https://github.com/WillPower3309/swayfx"; - maintainers = with maintainers; [ ricarch97 ]; license = licenses.mit; + maintainers = with maintainers; [ eclairevoyant ricarch97 ]; platforms = platforms.linux; + mainProgram = "sway"; longDescription = '' Fork of Sway, an incredible and one of the most well established Wayland diff --git a/nixpkgs/pkgs/applications/window-managers/sway/lock-fancy.nix b/nixpkgs/pkgs/applications/window-managers/sway/lock-fancy.nix index 2eb817b9b1f8..83d56def4dcc 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock -, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, grim +, gawk +, jq +, swaylock +, imagemagick +, getopt +, fontconfig +, wmctrl +, makeWrapper +, bash }: let @@ -14,19 +26,22 @@ let fontconfig wmctrl ]; -in stdenv.mkDerivation rec { - pname = "swaylock-fancy-unstable"; - version = "2021-10-11"; + mainProgram = "swaylock-fancy"; +in + +stdenv.mkDerivation { + pname = "swaylock-fancy"; + version = "unstable-2023-11-21"; src = fetchFromGitHub { owner = "Big-B"; repo = "swaylock-fancy"; - rev = "265fbfb438392339bf676b0a9dbe294abe2a699e"; - sha256 = "NjxeJyWYXBb1P8sXKgb2EWjF+cNodTE83r1YwRYoBjM="; + rev = "ff37ae3c6d0f100f81ff64fdb9d422c37de2f4f6"; + hash = "sha256-oS4YCbZOIrMP4QSM5eHWzTn18k3w2OnJ2k+64x/DnuM="; }; postPatch = '' - substituteInPlace swaylock-fancy \ + substituteInPlace ${mainProgram} \ --replace "/usr/share" "$out/share" ''; @@ -37,7 +52,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' - wrapProgram $out/bin/swaylock-fancy \ + wrapProgram $out/bin/${mainProgram} \ --prefix PATH : "${depsPath}" ''; @@ -46,6 +61,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/Big-B/swaylock-fancy"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ frogamic ]; + inherit mainProgram; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix b/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix index 84defaa98bed..c0b147e6ee58 100644 --- a/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ qyliss ] ++ wlroots.meta.maintainers; license = licenses.cc0; inherit (wlroots.meta) platforms; + mainProgram = "tinywl"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/trayer/default.nix b/nixpkgs/pkgs/applications/window-managers/trayer/default.nix index 57cf0fc93fac..60984987ab62 100644 --- a/nixpkgs/pkgs/applications/window-managers/trayer/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/trayer/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { description = "A lightweight GTK2-based systray for UNIX desktop"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; + mainProgram = "trayer"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/vwm/default.nix b/nixpkgs/pkgs/applications/window-managers/vwm/default.nix index b0b40afc9e4c..7cba387369c7 100644 --- a/nixpkgs/pkgs/applications/window-managers/vwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/vwm/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "vwm"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix b/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix index f4fea3f434c3..80900d0639b1 100644 --- a/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; + mainProgram = "windowlab"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/wmderland/default.nix b/nixpkgs/pkgs/applications/window-managers/wmderland/default.nix index c0fcdd859b21..322906d5657f 100644 --- a/nixpkgs/pkgs/applications/window-managers/wmderland/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wmderland/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = libX11.meta.platforms; maintainers = with maintainers; [ takagiy ]; + mainProgram = "wmderland"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix b/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix index f439833e547a..45170ab0d15a 100644 --- a/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ takagiy ]; + mainProgram = "wmderlandc"; }; }) diff --git a/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix index eaafac71b6c1..6c850278b337 100644 --- a/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.bsd2; maintainers = [ maintainers.balsoft ]; platforms = platforms.linux; + mainProgram = "wmfs"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/x-create-mouse-void/default.nix b/nixpkgs/pkgs/applications/window-managers/x-create-mouse-void/default.nix index d0241a296ad6..86ae59a6152c 100644 --- a/nixpkgs/pkgs/applications/window-managers/x-create-mouse-void/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/x-create-mouse-void/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ eigengrau ]; + mainProgram = "x-create-mouse-void"; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/yabar/build.nix b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix index 207e3a83ab2b..d66c905fea90 100644 --- a/nixpkgs/pkgs/applications/window-managers/yabar/build.nix +++ b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "yabar"; }; } |