diff options
430 files changed, 11016 insertions, 8503 deletions
diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 7bbe36373c685..fff18d201d43e 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -39,6 +39,8 @@ jobs: pkgs/test/cuda pkgs/top-level/cuda-packages.nix NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions + NIX_FMT_PATHS_PHP_PACKAGES: pkgs/development/php-packages + NIX_FMT_PATHS_BUILD_SUPPORT_PHP: pkgs/build-support/php # Iterate over all environment variables beginning with NIX_FMT_PATHS_. run: | for env_var in "${!NIX_FMT_PATHS_@}"; do diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 6083c0c9bf3c2..74666cb9244f9 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -92,7 +92,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition. -- [clatd](https://github.com/toreanderson/clatd), a a CLAT / SIIT-DC Edge Relay implementation for Linux. +- [clatd](https://github.com/toreanderson/clatd), a CLAT / SIIT-DC Edge Relay implementation for Linux. - [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable) @@ -177,6 +177,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [ALVR](https://github.com/alvr-org/alvr), a VR desktop streamer. Available as [programs.alvr](#opt-programs.alvr.enable) +- [xdg-terminal-exec](https://github.com/Vladimir-csp/xdg-terminal-exec), the proposed Default Terminal Execution Specification. + - [RustDesk](https://rustdesk.com), a full-featured open source remote control alternative for self-hosting and security with minimal configuration. Alternative to TeamViewer. Available as [services.rustdesk-server](#opt-services.rustdesk-server.enable). - [Scrutiny](https://github.com/AnalogJ/scrutiny), a S.M.A.R.T monitoring tool for hard disks with a web frontend. Available as [services.scrutiny](#opt-services.scrutiny.enable). diff --git a/nixos/modules/config/xdg/terminal-exec.nix b/nixos/modules/config/xdg/terminal-exec.nix new file mode 100644 index 0000000000000..daf2055d2e906 --- /dev/null +++ b/nixos/modules/config/xdg/terminal-exec.nix @@ -0,0 +1,54 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.xdg.terminal-exec; + inherit (lib) mkIf mkEnableOption mkOption mkPackageOption types; +in +{ + meta.maintainers = with lib.maintainers; [ Cryolitia ]; + + ###### interface + + options = { + xdg.terminal-exec = { + enable = mkEnableOption "xdg-terminal-exec, the [proposed](https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/46) Default Terminal Execution Specification"; + package = mkPackageOption pkgs "xdg-terminal-exec" { }; + settings = mkOption { + type = with types; attrsOf (listOf str); + default = { }; + description = '' + Configuration options for the Default Terminal Execution Specification. + + The keys are the desktop environments that are matched (case-insensitively) against `$XDG_CURRENT_DESKTOP`, + or `default` which is used when the current desktop environment is not found in the configuration. + The values are a list of terminals' [desktop file IDs](https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id) to try in order of decreasing priority. + ''; + example = { + default = [ "kitty.desktop" ]; + GNOME = [ "com.raggesilver.BlackBox.desktop" "org.gnome.Terminal.desktop" ]; + }; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment = { + systemPackages = [ cfg.package ]; + + etc = lib.mapAttrs' ( + desktop: terminals: + # map desktop name such as GNOME to `xdg/gnome-xdg-terminals.list`, default to `xdg/xdg-terminals.list` + lib.nameValuePair ( + "xdg/${if desktop == "default" then "" else "${lib.toLower desktop}-"}xdg-terminals.list" + ) { text = lib.concatLines terminals; } + ) cfg.settings; + }; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 111b5c129cb3c..36ab59020cc6c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -45,6 +45,7 @@ ./config/xdg/portals/lxqt.nix ./config/xdg/portals/wlr.nix ./config/xdg/sounds.nix + ./config/xdg/terminal-exec.nix ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index e648eaa1b68e4..5891ff25e4375 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -42,15 +42,6 @@ in xwayland.enable = mkEnableOption ("XWayland") // { default = true; }; - envVars.enable = mkEnableOption null // { - default = true; - example = false; - description = '' - Set environment variables for Hyprland to work properly. - Enabled by default. - ''; - }; - systemd.setPath.enable = mkEnableOption null // { default = true; example = false; @@ -83,15 +74,6 @@ in configPackages = mkDefault [ cfg.finalPackage ]; }; - environment.sessionVariables = mkIf cfg.envVars.enable { - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_DESKTOP = "Hyprland"; - XDG_SESSION_TYPE = "wayland"; - GDK_BACKEND = "wayland,x11"; - QT_QPA_PLATFORM = "wayland;xcb"; - _JAVA_AWT_WM_NONREPARENTING = "1"; # Fix for Java applications on tiling window managers - }; - systemd = mkIf cfg.systemd.setPath.enable { user.extraConfig = '' DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/%u/bin:/run/wrappers/bin" diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 005ae8f1c8a58..6fa8556e39bee 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -116,7 +116,7 @@ in lib.assertMsg (d != null -> (lib.types.str.check d && lib.elem d config.services.displayManager.sessionData.sessionNames)) '' Default graphical session, '${d}', not found. Valid names for 'services.displayManager.defaultSession' are: - ${lib.concatStringsSep "\n " cfg.displayManager.sessionData.sessionNames} + ${lib.concatStringsSep "\n " cfg.sessionData.sessionNames} ''; }; default = null; diff --git a/nixos/modules/services/networking/clatd.nix b/nixos/modules/services/networking/clatd.nix index 76e0c130ca466..de6cde4e979c0 100644 --- a/nixos/modules/services/networking/clatd.nix +++ b/nixos/modules/services/networking/clatd.nix @@ -43,7 +43,6 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/clatd -c ${configFile}"; - startLimitIntervalSec = 0; # Hardening CapabilityBoundingSet = [ diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index cf1282b3d4cf4..201085daa74a8 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -663,7 +663,7 @@ in '' + '' export KEYCLOAK_ADMIN=admin export KEYCLOAK_ADMIN_PASSWORD=${escapeShellArg cfg.initialAdminPassword} - kc.sh start --optimized + kc.sh --verbose start --optimized ''; }; diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 8e49e591f75cd..b9e5afd4d1419 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -276,8 +276,11 @@ in { ${lib.optionalString (cfg.mail.smtp.passwordFile != null) ''export SMTP_USER_PWD="$(< $CREDENTIALS_DIRECTORY/SMTP_USER_PWD )"''} - # setup - ${cfg.package}/createdb.sh + ${lib.optionalString cfg.database.postgres.setup '' + # setup + ${cfg.package}/createdb.sh" + ''} + ${cfg.package}/migrate.sh export IP_GEOLOCATION_DB=${pkgs.dbip-country-lite}/share/dbip/dbip-country-lite.mmdb ${cfg.package}/bin/plausible eval "(Plausible.Release.prepare() ; Plausible.Auth.create_user(\"$ADMIN_USER_NAME\", \"$ADMIN_USER_EMAIL\", \"$ADMIN_USER_PWD\"))" diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 226aa832f80f1..9aaff5539268f 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.4"; + version = "8.6"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-6qx/elkj4Kb4YK1JZG/S036WdUO7wEE6/yf4pZQP8J0="; + hash = "sha256-sMp24tjtX8fZJWc7dvb+9e6pEflT4ugoOZjDis6/3nM="; }; bundledContent = fetchzip { diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 797e9bd0e5f1b..39d258c806c72 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.07"; + version = "6.4.12"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-r36znpkyI6/UPtOm1ZjedOadRG1BiIscRV9qRLf/A5Q="; + hash = "sha256-nriw/nP73m27QWdhC5ooTuVMul+GdOUsnVroM/CZiiY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 72cbfd443c08b..d6d5a6d78a6c5 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -28,6 +28,12 @@ python3Packages.buildPythonApplication rec { rich ]; + postPatch = '' + # Disable update check + substituteInPlace pyradio/config \ + --replace-fail "distro = None" "distro = NixOS" + ''; + checkPhase = '' $out/bin/pyradio --help ''; diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index e4e02f03891b9..e0bc35858b047 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.17.2"; + version = "0.18.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TwMQtyg8ygFTI5DgT5rBVkZE31U4puaANIo5S8W0TXU="; + hash = "sha256-3nPESnBWaxWjWMvRG7gbXt8FzuPlx2soOonCKom+tzA="; }; - cargoHash = "sha256-RTvMywRWdZiBgNMjlUGa4jlD0HYOL3ESkVppGlsl4So="; + cargoHash = "sha256-9HroNMHvmNjGPnEO4kTDalHBXe5MH7btEwk6maLh05E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index cba677e6e16ad..29e0950775cba 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -12,23 +12,25 @@ , libXcursor , libXrandr , libXi +, libxkbcommon , vulkan-loader +, wayland , gnome , libsForQt5 }: rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "mtkennerly"; - repo = pname; + repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-FVM/HJpBd9G161JTaVTeWQhz4p5uDgQtohaIw1iNOJo="; + hash = "sha256-3Z/v3+3mrmPV2Rb/5tM+h6UN+MEIF/aK07B93Zn38AA="; }; - cargoHash = "sha256-5RhFyC4e4OOdnhwk4sgG6mmRVa1gLaBUA8DW5XW6E14="; + cargoHash = "sha256-bAap8eSXAPLrs5MEX1Pp6gKdp0iLxci4aX+2+ve6Wk0="; nativeBuildInputs = [ cmake @@ -49,12 +51,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/com.github.mtkennerly.ludusavi.metainfo.xml -t \ "$out/share/metainfo/" install -Dm644 assets/icon.png \ - "$out/share/icons/hicolor/64x64/apps/${pname}.png" + "$out/share/icons/hicolor/64x64/apps/ludusavi.png" install -Dm644 assets/icon.svg \ - "$out/share/icons/hicolor/scalable/apps/${pname}.svg" - install -Dm644 "assets/${pname}.desktop" -t "$out/share/applications/" + "$out/share/icons/hicolor/scalable/apps/ludusavi.svg" + install -Dm644 "assets/ludusavi.desktop" -t "$out/share/applications/" install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/" - install -Dm644 LICENSE -t "$out/share/licenses/${pname}/" + install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/" ''; postFixup = @@ -68,12 +70,14 @@ rustPlatform.buildRustPackage rec { libXcursor libXrandr libXi + libxkbcommon vulkan-loader + wayland ]; in '' - patchelf --set-rpath "${libPath}" "$out/bin/$pname" - wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} + patchelf --set-rpath "${libPath}" "$out/bin/ludusavi" + wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} ''; diff --git a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock b/pkgs/applications/backup/proxmox-backup-client/Cargo.lock index 18d7726b3cb5c..2412f6a78da65 100644 --- a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock +++ b/pkgs/applications/backup/proxmox-backup-client/Cargo.lock @@ -18,31 +18,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -60,23 +78,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", - "peeking_take_while", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2 1.0.81", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.60", "which", ] @@ -88,30 +112,40 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "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.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -130,10 +164,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown", + "stacker", +] + +[[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -152,15 +196,80 @@ dependencies = [ ] [[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2 1.0.81", + "quote 1.0.36", + "unicode-xid 0.2.4", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[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" @@ -183,9 +292,25 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "email-encoding" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +dependencies = [ + "base64 0.22.1", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" [[package]] name = "endian-type" @@ -214,9 +339,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -252,6 +377,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] name = "fd-lock" version = "3.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -264,21 +395,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -316,9 +447,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -331,9 +462,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -341,15 +472,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -358,38 +489,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -404,10 +535,20 @@ 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 = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -428,9 +569,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -446,16 +587,34 @@ dependencies = [ ] [[package]] +name = "handlebars" +version = "3.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" +dependencies = [ + "log", + "pest", + "pest_derive", + "quick-error", + "serde", + "serde_json", +] + +[[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -468,18 +627,29 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -488,9 +658,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -517,9 +687,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -532,7 +702,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -551,9 +721,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -561,35 +731,44 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -607,30 +786,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] +name = "lettre" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" +dependencies = [ + "base64 0.22.1", + "chumsky", + "email-encoding", + "email_address", + "fastrand", + "futures-util", + "hostname", + "httpdate", + "idna", + "mime", + "native-tls", + "nom", + "percent-encoding", + "quoted_printable", + "socket2", + "tokio", + "url", +] + +[[package]] name = "libc" -version = "0.2.150" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -645,21 +848,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -680,6 +883,12 @@ dependencies = [ ] [[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -687,18 +896,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -706,6 +915,24 @@ dependencies = [ ] [[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] name = "nibble_vec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -762,26 +989,26 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -796,16 +1023,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -826,6 +1059,7 @@ name = "pbs-api-types" version = "0.1.0" dependencies = [ "anyhow", + "const_format", "hex", "lazy_static", "percent-encoding", @@ -843,7 +1077,7 @@ dependencies = [ [[package]] name = "pbs-buildcfg" -version = "3.1.2" +version = "3.2.2" [[package]] name = "pbs-client" @@ -897,7 +1131,7 @@ name = "pbs-config" version = "0.1.0" dependencies = [ "anyhow", - "hex", + "const_format", "lazy_static", "libc", "nix 0.26.4", @@ -905,6 +1139,7 @@ dependencies = [ "openssl", "pbs-api-types", "pbs-buildcfg", + "proxmox-notify", "proxmox-router", "proxmox-schema", "proxmox-section-config", @@ -921,7 +1156,7 @@ name = "pbs-datastore" version = "0.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "crc32fast", "endian_trait", "futures", @@ -1016,6 +1251,7 @@ dependencies = [ "libc", "log", "nix 0.26.4", + "openssl", "pbs-api-types", "pbs-config", "proxmox-io", @@ -1037,7 +1273,7 @@ name = "pbs-tools" version = "0.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "bytes", "crc32fast", "endian_trait", @@ -1068,22 +1304,61 @@ dependencies = [ ] [[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] +name = "pest" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", +] + +[[package]] +name = "pest_meta" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1093,9 +1368,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro2" @@ -1103,26 +1378,26 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0" dependencies = [ - "unicode-xid", + "unicode-xid 0.1.0", ] [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-api-macro" -version = "1.0.6" +version = "1.0.8" dependencies = [ "anyhow", - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -1140,9 +1415,10 @@ dependencies = [ [[package]] name = "proxmox-auth-api" -version = "0.3.2" +version = "0.3.5" dependencies = [ "anyhow", + "const_format", "lazy_static", "proxmox-schema", "regex", @@ -1152,7 +1428,7 @@ dependencies = [ [[package]] name = "proxmox-backup" -version = "3.1.2" +version = "3.2.2" [[package]] name = "proxmox-backup-banner" @@ -1228,9 +1504,10 @@ dependencies = [ [[package]] name = "proxmox-fuse" -version = "0.1.4" +version = "0.1.7" dependencies = [ "anyhow", + "cc", "futures", "libc", "tokio", @@ -1239,10 +1516,10 @@ dependencies = [ [[package]] name = "proxmox-http" -version = "0.9.0" +version = "0.9.1" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "futures", "http", "hyper", @@ -1253,6 +1530,7 @@ dependencies = [ "serde_json", "tokio", "tokio-openssl", + "ureq", "url", ] @@ -1267,7 +1545,7 @@ dependencies = [ [[package]] name = "proxmox-human-byte" -version = "0.1.2" +version = "0.1.3" dependencies = [ "anyhow", "proxmox-schema", @@ -1288,8 +1566,32 @@ name = "proxmox-lang" version = "1.1.0" [[package]] +name = "proxmox-notify" +version = "0.4.0" +dependencies = [ + "anyhow", + "const_format", + "handlebars", + "lettre", + "log", + "openssl", + "proxmox-http", + "proxmox-http-error", + "proxmox-human-byte", + "proxmox-schema", + "proxmox-section-config", + "proxmox-serde", + "proxmox-sys", + "proxmox-time", + "proxmox-uuid", + "regex", + "serde", + "serde_json", +] + +[[package]] name = "proxmox-router" -version = "2.1.1" +version = "2.1.3" dependencies = [ "anyhow", "env_logger", @@ -1311,9 +1613,10 @@ dependencies = [ [[package]] name = "proxmox-schema" -version = "2.0.2" +version = "3.1.0" dependencies = [ "anyhow", + "const_format", "lazy_static", "proxmox-api-macro", "regex", @@ -1324,7 +1627,7 @@ dependencies = [ [[package]] name = "proxmox-section-config" -version = "2.0.0" +version = "2.0.1" dependencies = [ "anyhow", "hex", @@ -1339,7 +1642,7 @@ name = "proxmox-serde" version = "0.1.1" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "proxmox-time", "serde", "serde_json", @@ -1359,17 +1662,17 @@ dependencies = [ name = "proxmox-sortable-macro" version = "0.1.3" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "proxmox-sys" -version = "0.5.2" +version = "0.5.3" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "lazy_static", "libc", "log", @@ -1384,7 +1687,7 @@ dependencies = [ [[package]] name = "proxmox-time" -version = "1.1.5" +version = "1.1.6" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -1404,6 +1707,15 @@ dependencies = [ ] [[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] name = "pxar" version = "0.10.2" dependencies = [ @@ -1436,6 +1748,12 @@ dependencies = [ ] [[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] name = "quote" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1446,14 +1764,20 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.81", ] [[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + +[[package]] name = "radix_trie" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1465,15 +1789,6 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" @@ -1483,9 +1798,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -1494,9 +1809,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -1506,9 +1821,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1517,9 +1832,24 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "ring" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] [[package]] name = "rustc-demangle" @@ -1535,11 +1865,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -1547,6 +1877,60 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + +[[package]] +name = "rustls-webpki" +version = "0.102.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] name = "rustyline" version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1572,9 +1956,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -1586,36 +1970,68 @@ dependencies = [ ] [[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] +name = "security-framework" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "serde" -version = "1.0.193" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1632,16 +2048,27 @@ dependencies = [ ] [[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1663,9 +2090,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -1675,22 +2102,31 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "socket2" -version = "0.5.5" +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stacker" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" dependencies = [ + "cc", + "cfg-if", "libc", - "windows-sys 0.48.0", + "psm", + "winapi", ] [[package]] @@ -1700,6 +2136,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] name = "syn" version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1707,17 +2149,17 @@ checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5" dependencies = [ "proc-macro2 0.2.3", "quote 0.4.2", - "unicode-xid", + "unicode-xid 0.1.0", ] [[package]] name = "syn" -version = "2.0.39" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2 1.0.81", + "quote 1.0.36", "unicode-ident", ] @@ -1733,19 +2175,31 @@ dependencies = [ ] [[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", @@ -1754,22 +2208,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -1789,9 +2243,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -1800,7 +2254,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -1811,16 +2265,16 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "tokio-openssl" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" dependencies = [ "futures-util", "openssl", @@ -1830,9 +2284,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -1880,9 +2334,21 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "udev" @@ -1896,9 +2362,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -1914,24 +2380,24 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -1940,6 +2406,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[package]] name = "url" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1963,10 +2459,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -1989,9 +2491,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1999,47 +2501,56 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.33", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "which" @@ -2071,11 +2582,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2085,6 +2596,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2099,7 +2629,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2119,17 +2649,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2140,9 +2671,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2152,9 +2683,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2164,9 +2695,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2176,9 +2713,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2188,9 +2725,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2200,9 +2737,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2212,17 +2749,19 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -2232,6 +2771,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] name = "zstd" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2252,9 +2817,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "bindgen", "cc", @@ -2262,21 +2827,17 @@ dependencies = [ ] [[patch.unused]] -name = "proxmox-ldap" -version = "0.2.1" - -[[patch.unused]] -name = "proxmox-metrics" -version = "0.3.0" +name = "proxmox-apt" +version = "0.10.9" [[patch.unused]] name = "proxmox-rest-server" -version = "0.5.1" +version = "0.5.2" [[patch.unused]] name = "proxmox-subscription" -version = "0.4.2" +version = "0.4.3" [[patch.unused]] name = "proxmox-tfa" -version = "4.1.0" +version = "4.1.2" diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/applications/backup/proxmox-backup-client/default.nix index e074c131e39e1..41060b725110b 100644 --- a/pkgs/applications/backup/proxmox-backup-client/default.nix +++ b/pkgs/applications/backup/proxmox-backup-client/default.nix @@ -2,6 +2,7 @@ , fetchgit , rustPlatform , pkg-config +, pkgconf , openssl , fuse3 , libuuid @@ -18,36 +19,36 @@ let pname = "proxmox-backup-client"; - version = "3.1.2"; + version = "3.2.2"; proxmox-backup_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-backup.git"; rev = "v${version}"; name = "proxmox-backup"; - hash = "sha256-G4wadZelQHlveVhuOpu0FjLvfegoimoxlw3Fe8DhsQA="; + hash = "sha256-9rzUGaUoc87VkB4XJUwI0BjuvxdemE6fjTIR7VRp55Y="; }; # Same revision as used in # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=proxmox-backup-client proxmox_src = fetchgit { url = "git://git.proxmox.com/git/proxmox.git"; - rev = "50b79198f83659e77b810fe0eedaa79b140744db"; + rev = "863d7603403405ccbf8e841b875bf3c9a7a76116"; name = "proxmox"; - hash = "sha256-ffkOXGqe0xjvvhouzemcQ8qNdmJx70x10ny2uhYAYaI="; + hash = "sha256-aSBT0TGhmM7QDux4gDY1k4HQhAMNWvxX+IVIsq6KeuM="; }; proxmox-fuse_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-fuse.git"; - rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79"; + rev = "6faec3a52fcdb0df3ca13fee2977683824d62d01"; # 0.1.7-1 name = "proxmox-fuse"; - hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ="; + hash = "sha256-FwkZ5L7gJr9xZTQkdVHmOP8vnzf+To5Wz2SbIEzGUOY="; }; proxmox-pxar_src = fetchgit { url = "git://git.proxmox.com/git/pxar.git"; - rev = "fab647085426dc39c25c137575a3b8fc575c4b78"; + rev = "675ecff32fbeff0973eaea016c4b8f3877015adb"; name = "pxar"; - hash = "sha256-tedQDQUFSGUZCChGcRRJsh7lIozfispLCLeX1OuUc4k="; + hash = "sha256-P5fblRCFq7NI1UkP/jkg38bamM1yuJYX+YhCKPgS15Y="; }; proxmox-pathpatterns_src = fetchgit { @@ -57,6 +58,7 @@ let hash = "sha256-717XSlvQdvP0Q516fEx04rsrLCk3QI8frTD5NMmkSr4="; }; + aurPatchCommit = "12c04aa14ee09cb3dafcbe193da9d36a6809695d"; in rustPlatform.buildRustPackage { @@ -80,15 +82,15 @@ rustPlatform.buildRustPackage { # works in combination with the other three repos being checked out. (fetchpatch { name = "0001-re-route-dependencies-not-available-on-crates.io-to-.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=33ef762d3b3a8a0300117efada8d957f6d0cfa07"; - hash = "sha256-hBct1NVFum7WG0sgdE7DdvjfnC6KPlLG9r4syxgYKWA="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; + hash = "sha256-YOlC8A1FKIbNY9+q6n/gDV0efHx2i3kwsmIdZcYhf80="; }) # This patch prevents the generation of the man-pages for other components inside the repo, # which would require them too be built too. Thus avoid wasting resources and just skip them. (fetchpatch { name = "0002-docs-drop-all-but-client-man-pages.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=33ef762d3b3a8a0300117efada8d957f6d0cfa07"; - hash = "sha256-DvWm18udvOpcma0V3JY06Lhn+h0BDPhNqrNOyrgpvWk="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; + hash = "sha256-vUGDBx+g05ipL+boY9DaWDAMmstY1IDZs5nILbCIBLY="; }) # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`. @@ -135,7 +137,7 @@ rustPlatform.buildRustPackage { doCheck = false; - nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook installShellFiles sphinx ]; + nativeBuildInputs = [ git pkg-config pkgconf rustPlatform.bindgenHook installShellFiles sphinx ]; buildInputs = [ openssl fuse3 libuuid acl libxcrypt ]; passthru.tests.version = testers.testVersion { diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0b17b14b7deae..79153066705bf 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1240,12 +1240,12 @@ sniprun = let - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-siM0MBugee2OVaD1alr2hKn9ngoaV3Iy9No/F3wryJs="; + hash = "sha256-PQ3nAZ+bMbHHJWD7cV6h1b3g3TzrakA/N8vVumIooMg="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1255,7 +1255,7 @@ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-Gnpv0vAU3kTtCKsV2XGlSbzYuHEqR7iDFeKj9Vhq1UQ="; + cargoHash = "sha256-I8R2V9zoLqiM4lu0D7URoVof68wtKHI+8T8fVrUg7i4="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 27bce5cd2abfa..854eb94ad0a55 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4094,6 +4094,8 @@ let }; }; + tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { }; + theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-pascal"; diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix new file mode 100644 index 0000000000000..140a371efd456 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -0,0 +1,64 @@ +{ + stdenv, + jq, + lib, + moreutils, + typos-lsp, + vscode-utils, +}: +let + inherit (stdenv.hostPlatform) system; + + extInfo = + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-CPUlJ1QzGiZKd4r46Iioc5svw0oLsMsYnc0KxT1p0zM="; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-qSTCZHL7nfB300qwuqgl/4u+SYNMA2BFCrD+yQEgN/c="; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-FcZH2bB5B3wnu6F76kGp9FBdD3yZtr57TQ5xaUfRcmY="; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-3HdK4x2WNdb9Zxqjtn9lmbgrMOzz14rH0ZF0x9B0BHY="; + }; + } + .${system} or (throw "Unsupported system: ${system}"); +in +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "typos-vscode"; + publisher = "tekumara"; + # Please update the corresponding binary (typos-lsp) + # when updating this extension. + # See pkgs/by-name/ty/typos-lsp/package.nix + version = "0.1.18"; + inherit (extInfo) hash arch; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ typos-lsp ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typos.path".default = "${lib.getExe typos-lsp}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/tekumara.typos-vscode/changelog"; + description = "A VSCode extension for providing a low false-positive source code spell checker"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tekumara.typos-vscode"; + homepage = "https://github.com/tekumara/typos-lsp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 8f317553dd20c..4115c489b2e4e 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "e41f864c0abb36aef20f8e37cd9d9a92c00a9221", - "hash": "sha256-LkkW5mQmwv89ZECssVh43ezwe4xMagUOiSz82OupISQ=" + "rev": "77a965d3433b1585638b54aa6a15d0c33a64ea0c", + "hash": "sha256-KuXvzse/EnzCcRoWVtZP1f/SKOp6qGrLbzbQEuFQGqA=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-05-03" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -408,10 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "90714f5cdefb2024dc34fdf3a62bd0d3815460ce", - "hash": "sha256-5Fd57fLIEKxr5KaHywGyHgA29midWpWEFotvudQKtjs=" + "rev": "3272473e69880675756547fc5896d0869ba14255", + "hash": "sha256-DWDPQM4YWuH4oH+03VmFs6yXN2dAKxc5zXSV42YbMyg=", + "fetchSubmodules": true }, - "version": "unstable-2024-04-26" + "version": "unstable-2024-05-04" }, "mame2000": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 3b4ee5f776925..4e15315ce7268 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-scripts +#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-git -p nix-prefetch-scripts import json import os @@ -69,7 +69,11 @@ CORES = { "gw": {"repo": "gw-libretro"}, "handy": {"repo": "libretro-handy"}, "hatari": {"repo": "hatari"}, - "mame": {"repo": "mame"}, + # Setting fetch_submodules=True since libretro/mame constantly gives + # different hashes for its tarballs, see: + # - https://github.com/NixOS/nixpkgs/issues/259488#issuecomment-1751768379 + # - https://github.com/NixOS/nixpkgs/pull/303494 + "mame": {"repo": "mame", "fetch_submodules": True}, "mame2000": {"repo": "mame2000-libretro"}, "mame2003": {"repo": "mame2003-libretro"}, "mame2003-plus": {"repo": "mame2003-plus-libretro"}, diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index f3587cf2ea5d4..33ddbd9159fef 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -56,13 +56,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "2.10.36"; + version = "2.10.38"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-PTvDxppL2zrqm6LVOF7ZjqA5U/OFeq/R1pdgEe1827I="; + sha256 = "sha256-UKhF7sEciDH+hmFweVD1uERuNfMO37ms+Y+FwRM/hW4="; }; patches = [ diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 09bae86572cf9..71f93ae40e7a4 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.27.0"; + version = "2.28.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-yutS8xSTRABt12+mEyU99R4eCHvuAwWdO40SZlUrtdc=" "zip"; - i686-linux = fetch "linux_386" "sha256-juP//g9quhd7GRq5TNm3qAq+rOegGJ9u9F+fmGbfmbw=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-cFQ3lsHBV9fDoNK5ujTummIXA4591meP43KbiyWcbQk=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-fUwiEJxn4JdsViBQU2Odrw+Focp0ngH/RmfmW2Uu0Bo=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-rF0HWKLdLDmT5nXqZyn+nwd3DZxkP76Jm+xofvA1dpU=" "zip"; + i686-linux = fetch "linux_386" "sha256-b9OPsZJTGoAeedj/dv88lkX2Q4p9HG585mWyl7ZfDz4=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-5ZiMQaQLYUR9BZroyG0o+M79cR4GQb6rDyVmIcTZh3o=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-5VmogWqCYMdrg9dyRt4lurPmSRdUUHt4LT3lkOEKdEI=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 1e8113765f12b..787a8c46374a5 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytest-bdd pytest-xdist - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) toml ]; diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 243a485c4a52b..136ad6115d786 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "klipper-estimator"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "Annex-Engineering"; repo = "klipper_estimator"; rev = "v${version}"; - hash = "sha256-OvDdANowsz3qU2KV4WbUWyDrh3sG02+lBKNtcq6ecZ8="; + hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U="; }; - cargoHash = "sha256-1O3kXeGPALSa/kNWRArk6ULG0+3UgTxVBzrsqDHHpDU="; + cargoHash = "sha256-bboXG2nBrK2hVzB43um6EUgLPlSa8huyPH7VOJ48Nkk="; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index 4f4c915050274..275e441fb55d1 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.10.0"; + version = "2.11.0"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-5bRmM/BXI0Afe7UK6avh5aWFXkYF4MsUG71uYUc5JlA="; + hash = "sha256-RQBSNfJQx3D07frYhKdNlRFMJYXiOC9NAT3bbqCr2Ls="; stripRoot = false; }; diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index f7517597b0c96..922916ab1307a 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -3,24 +3,12 @@ version = 3 [[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - -[[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "version_check", "zerocopy", @@ -43,53 +31,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[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-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-task" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "atomic-waker" -version = "1.1.2" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "autocfg" @@ -99,15 +43,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.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" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block" @@ -116,73 +54,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "fastrand", - "futures-io", - "futures-lite", - "piper", - "tracing", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byte-slice-cast" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] name = "cairo-rs" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" +checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.1", + "bitflags", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -191,18 +79,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -210,36 +95,15 @@ dependencies = [ [[package]] name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -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 = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" -dependencies = [ - "crossbeam-utils 0.8.16", -] - -[[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -256,100 +120,12 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.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-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils 0.8.16", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", - "memoffset", - "scopeguard", -] - -[[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.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] name = "dbus" version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -361,26 +137,6 @@ dependencies = [ ] [[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] name = "dlv-list" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -390,12 +146,6 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -412,12 +162,6 @@ dependencies = [ ] [[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] name = "fallible-iterator" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -430,12 +174,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[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" @@ -447,24 +185,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -473,42 +211,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "1.13.0" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "futures-core", - "pin-project-lite", -] +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-macro", @@ -519,32 +247,22 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] name = "gdk-pixbuf" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ "gio-sys", "glib-sys", @@ -555,9 +273,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -570,9 +288,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -586,22 +304,12 @@ 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 = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -628,9 +336,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d809baf02bdf1b5ef4ad3bf60dd9d4977149db4612b7bbb58e56aef168193b" +checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" dependencies = [ "futures-channel", "futures-core", @@ -639,7 +347,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -647,54 +354,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", -] - -[[package]] -name = "gl" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94edab108827d67608095e269cf862e60d920f144a5026d3dbcfd8b877fb404" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "gl_loader" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32d96dd5f881490e537041d5532320812ba096097f07fccb4626578da0b99d3" -dependencies = [ - "cc", - "libc", + "windows-sys", ] [[package]] name = "glib" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" +checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" dependencies = [ - "bitflags 2.4.1", + "bitflags", "futures-channel", "futures-core", "futures-executor", @@ -706,30 +383,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ "heck", - "proc-macro-crate 2.0.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -737,9 +412,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -748,9 +423,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ "glib", "graphene-sys", @@ -759,9 +434,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ "glib-sys", "libc", @@ -771,9 +446,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ "cairo-rs", "gdk4", @@ -786,9 +461,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -802,9 +477,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ "cairo-rs", "field-offset", @@ -823,12 +498,12 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -837,9 +512,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -855,39 +530,22 @@ dependencies = [ ] [[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] name = "hashbrown" -version = "0.7.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.3.8", - "autocfg", - "serde", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -dependencies = [ - "ahash 0.8.6", + "ahash", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" dependencies = [ - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -897,88 +555,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[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", - "num-traits", - "png", -] - -[[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "interprocess" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" -dependencies = [ - "blocking", - "cfg-if 1.0.0", - "futures-core", - "futures-io", - "intmap", - "libc", - "once_cell", - "rustc_version", - "spinning", - "thiserror", - "to_method", - "winapi", -] - -[[package]] -name = "intmap" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" - -[[package]] name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "lazy_static" @@ -988,9 +578,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -1004,9 +594,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -1020,9 +610,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -1035,9 +625,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -1068,22 +658,6 @@ dependencies = [ ] [[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1093,16 +667,10 @@ dependencies = [ ] [[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.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -1114,110 +682,23 @@ dependencies = [ ] [[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] name = "missioncenter" -version = "0.4.4" +version = "0.4.5" dependencies = [ - "arrayvec 0.7.4", "dbus", "errno-sys", "gettext-rs", - "gl", - "gl_loader", "gtk4", - "interprocess", "lazy_static", "libadwaita", "libc", "libudev-sys", - "pathfinder_canvas", - "pathfinder_color", - "pathfinder_content", - "pathfinder_geometry", - "pathfinder_gl", - "pathfinder_gpu", - "pathfinder_renderer", - "pathfinder_resources", - "raw-cpuid", "regex", "rusqlite", "rust-ini", "serde", "serde_json", - "sha2", - "shared_memory_extended", - "sysinfo", "textdistance", - "thiserror", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", ] [[package]] @@ -1251,9 +732,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" @@ -1262,27 +743,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" dependencies = [ "dlv-list", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] name = "pango" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ "glib-sys", "gobject-sys", @@ -1291,137 +771,6 @@ dependencies = [ ] [[package]] -name = "pathfinder_canvas" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "pathfinder_color", - "pathfinder_content", - "pathfinder_geometry", - "pathfinder_renderer", -] - -[[package]] -name = "pathfinder_color" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_content" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "arrayvec 0.5.2", - "bitflags 1.3.2", - "image", - "log", - "pathfinder_color", - "pathfinder_geometry", - "pathfinder_simd", - "smallvec", -] - -[[package]] -name = "pathfinder_geometry" -version = "0.5.1" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "log", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_gl" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "gl", - "half", - "log", - "pathfinder_geometry", - "pathfinder_gpu", - "pathfinder_resources", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_gpu" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "bitflags 1.3.2", - "fxhash", - "half", - "image", - "instant", - "log", - "pathfinder_color", - "pathfinder_geometry", - "pathfinder_resources", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_renderer" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "bitflags 1.3.2", - "byte-slice-cast", - "byteorder", - "crossbeam-channel", - "fxhash", - "half", - "hashbrown 0.7.2", - "instant", - "log", - "pathfinder_color", - "pathfinder_content", - "pathfinder_geometry", - "pathfinder_gpu", - "pathfinder_resources", - "pathfinder_simd", - "pathfinder_ui", - "rayon", - "serde", - "serde_json", - "smallvec", - "vec_map", -] - -[[package]] -name = "pathfinder_resources" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" - -[[package]] -name = "pathfinder_simd" -version = "0.5.2" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "pathfinder_ui" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "hashbrown 0.7.2", - "pathfinder_color", - "pathfinder_geometry", - "pathfinder_gpu", - "pathfinder_resources", - "pathfinder_simd", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1434,57 +783,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[package]] name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.7", + "toml_edit 0.21.1", ] [[package]] @@ -1513,86 +823,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "raw-cpuid" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" -dependencies = [ - "bitflags 2.4.1", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils 0.8.16", -] - -[[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -1602,9 +853,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1619,11 +870,11 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rusqlite" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ - "bitflags 2.4.1", + "bitflags", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -1633,12 +884,13 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ordered-multimap", + "trim-in-place", ] [[package]] @@ -1652,47 +904,41 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "scopeguard" -version = "1.2.0" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -1701,38 +947,14 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "shared_memory_extended" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "nix", - "rand", - "win-sys", -] - -[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1743,18 +965,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "spinning" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" -dependencies = [ - "lock_api", -] +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" @@ -1769,9 +982,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -1779,20 +992,6 @@ dependencies = [ ] [[package]] -name = "sysinfo" -version = "0.29.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "winapi", -] - -[[package]] name = "system-deps" version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1807,15 +1006,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "textdistance" @@ -1825,22 +1024,22 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -1853,21 +1052,15 @@ dependencies = [ ] [[package]] -name = "to_method" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" - -[[package]] name = "toml" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.6", ] [[package]] @@ -1881,60 +1074,33 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-core", + "winnow 0.6.5", ] [[package]] -name = "tracing-core" -version = "0.1.32" +name = "trim-in-place" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" [[package]] name = "unicode-ident" @@ -1949,12 +1115,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "version-compare" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1973,79 +1133,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" - -[[package]] -name = "web-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "win-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" -dependencies = [ - "windows", -] - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2068,79 +1155,105 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.34.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] name = "windows_aarch64_msvc" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] -name = "xml-rs" -version = "0.8.19" +name = "winnow" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index 8bfbb4298a1b4..6f8fb90bc26bf 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-J0wSu/jWpUJ7Ga6RecY4yLT7i5Ry1HiI+t30SAHOkMw="; + hash = "sha256-e5+uB2vzwRqjUiR+gxpSARHPqG+1iX3yifsfwv5LnZI="; }; cargoDeps = symlinkJoin { @@ -59,9 +59,6 @@ stdenv.mkDerivation rec { paths = [ (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes = { - "pathfinder_canvas-0.5.0" = "sha256-qEp16TVggPtvFvDuUyWsS6rH6MeO6FW0K6BnACghaCg="; - }; }) (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index c3487fe479b85..792a68f66f979 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -9,10 +9,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arrayvec" @@ -31,9 +40,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bincode" @@ -52,9 +61,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block-buffer" @@ -66,10 +75,20 @@ dependencies = [ ] [[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" dependencies = [ "bytemuck_derive", ] @@ -87,16 +106,17 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77042b5b585f701f1cfb4b6b12ebc02b9b0cefbc8dcce235906b6bf376d4245d" +checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342" dependencies = [ "anyhow", "core-foundation", "filetime", "hex", + "ignore", "jobserver", - "libc 0.2.150", + "libc 0.2.153", "miow", "same-file", "sha2", @@ -104,17 +124,14 @@ dependencies = [ "tempfile", "tracing", "walkdir", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc 0.2.150", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -123,10 +140,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -144,39 +167,64 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", - "libc 0.2.150", + "libc 0.2.153", ] [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -198,7 +246,7 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", "libdbus-sys", "winapi", ] @@ -233,11 +281,11 @@ dependencies = [ [[package]] name = "drm" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58eefd79f5173683872c0c82d0f05c2dc3c583d631259f60bb7a323756b7ff2" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytemuck", "drm-ffi", "drm-fourcc", @@ -246,9 +294,9 @@ dependencies = [ [[package]] name = "drm-ffi" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220dd8c12ebf2b0cbaffa19e00de02f5f090d363fb900f16ea012c077eea1174" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", "rustix", @@ -262,12 +310,12 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5115283ec60c99da8a9e5dc3c55f27680211e974c948cb6f3b51f0373190503b" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" dependencies = [ - "libc 0.2.150", - "linux-raw-sys 0.6.1", + "libc 0.2.153", + "linux-raw-sys 0.6.4", ] [[package]] @@ -277,17 +325,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" dependencies = [ "khronos", - "libc 0.2.150", + "libc 0.2.153", ] [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "libc 0.2.150", - "windows-sys", + "libc 0.2.153", + "windows-sys 0.52.0", ] [[package]] @@ -298,14 +346,14 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", - "libc 0.2.150", - "redox_syscall 0.3.5", - "windows-sys", + "libc 0.2.153", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -320,16 +368,16 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "gatherer" -version = "0.4.4" +version = "0.4.5" dependencies = [ "anyhow", "arrayvec", @@ -344,7 +392,7 @@ dependencies = [ "flate2", "gbm", "lazy_static", - "libc 0.2.150", + "libc 0.2.153", "nix", "pkg-config", "rust-ini", @@ -357,15 +405,15 @@ dependencies = [ [[package]] name = "gbm" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65dffaf38d96aa22cb748ccd9b1ffe624931e899f54c0225815ef7ac757a409f" +checksum = "313702b30cdeb83ddc72bc14dcee67803cd0ae2d12282ea06e368c25a900c844" dependencies = [ "bitflags 1.3.2", "drm", "drm-fourcc", "gbm-sys", - "libc 0.2.150", + "libc 0.2.153", ] [[package]] @@ -374,7 +422,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", ] [[package]] @@ -389,16 +437,29 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", - "libc 0.2.150", + "libc 0.2.153", "wasi", ] [[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] + +[[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -412,27 +473,43 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", ] [[package]] @@ -458,9 +535,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -483,27 +560,33 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "linux-raw-sys" -version = "0.6.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4a7ec558fa3b65e4c69b6af8df01fb9ad51ac69262335e1505276bc091935d" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -514,25 +597,26 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", - "libc 0.2.150", + "cfg_aliases", + "libc 0.2.153", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" @@ -546,9 +630,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" @@ -558,110 +642,129 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] -name = "redox_syscall" -version = "0.4.1" +name = "regex-automata" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ - "bitflags 1.3.2", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", - "libc 0.2.150", + "libc 0.2.153", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rust-ini" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" dependencies = [ "cfg-if", "ordered-multimap", + "trim-in-place", ] [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", - "libc 0.2.150", - "linux-raw-sys 0.4.11", - "windows-sys", + "libc 0.2.153", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -673,29 +776,19 @@ dependencies = [ ] [[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "serde" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -704,9 +797,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -737,10 +830,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] name = "syn" -version = "2.0.39" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -754,21 +853,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", - "libc 0.2.150", + "libc 0.2.153", "xattr", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -827,6 +925,12 @@ dependencies = [ ] [[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + +[[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -834,9 +938,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -846,9 +950,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -861,15 +965,16 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.8.0" +version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", + "rustls-pki-types", "rustls-webpki", "url", "webpki-roots", @@ -877,9 +982,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -894,9 +999,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -910,9 +1015,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "winapi" @@ -951,7 +1059,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", ] [[package]] @@ -960,13 +1077,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -976,46 +1108,96 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", + "linux-raw-sys 0.4.13", + "rustix", ] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/applications/misc/oranda/default.nix index 832f6f8048d68..db3103ea42497 100644 --- a/pkgs/applications/misc/oranda/default.nix +++ b/pkgs/applications/misc/oranda/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-BOMAkmJ2i/zqp6v49xeIF+EfZob8yXohPh86ERwp5OU="; + hash = "sha256-PECM0HLomMzNWnERgvYSfSh+XQAjGLxybZAJcaAzEBo="; }; - cargoHash = "sha256-SjXPfrO/YiOb1gOw75nAstKFipeIvLV6yl/sy+BZqE4="; + cargoHash = "sha256-qO48oR3RtyCbhdGn+VZPceZX/RMqS+5LacSASYRboMo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index d999744bdb89f..534556e231dec 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -8,6 +8,7 @@ , python3 , wrapGAppsHook3 , libinput +, gobject-introspection , gnome , gnome-desktop , glib @@ -24,15 +25,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.37.0"; + version = "0.38.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-SQLoOjqDBL1G3SDO4mfVRV2U0i+M1EwiqUR52ytFJmM="; + hash = "sha256-OcRUnw1Fck9bMSgfMMcWqqR6a6yzyKjY8P3nqcwVULc="; }; nativeBuildInputs = [ + gobject-introspection meson ninja pkg-config diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 8d59db378728c..c43c9f834fd2d 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.11"; + version = "1.1.12"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-fVWfV7rEu/knysWUrPeokBBlSGnvNlpiptAd1M7ZVd8="; + hash = "sha256-EXxAc25DLWAdcDVOlLC0uUWMIZf/SlouHD3syn0uSCI="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index f03ea6eaed367..ceee30cd660ba 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-76nmlZFLon9EquM7tQ/PReM1rxkzh7x1rNdaP3n4KKg="; + sha256 = "sha256-1p7Si1av/8fhtqfAsgQoqes+u1RlhZI0AhGrTSuLDrI="; }; vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index 38f0f83181348..81ba584cc2464 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -1,22 +1,37 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }: +{ + stdenv, + lib, + fetchurl, + fetchFromGitHub, + jq, + wofi, + wtype, + wl-clipboard, +}: -let emojiJSON = fetchurl { - url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.10/dist/emoji-en-US.json"; - hash = "sha256-UhAB5hVp5vV2d1FjIb2TBd2FJ6OPBbiP31HGAEDQFnA=";}; +let + emojiJSON = fetchurl { + url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.11/dist/emoji-en-US.json"; + hash = "sha256-WHqCSNgDzc6ZASdVrwPvsU4MtBcYLKDp2D2Hykrq1sI="; + }; in stdenv.mkDerivation rec { pname = "wofi-emoji"; - version = "unstable-2023-12-22"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Zeioth"; - repo = pname; - rev = "2cc95880848134a3bbe0675bcb62a0dae1d0f572"; - hash = "sha256-t9M8z8JxuvBDzNs98L7YTNUfTK23W1DYGdHDiXNQOgk="; + repo = "wofi-emoji"; + rev = "v${version}"; + hash = "sha256-wLZK7RcDxxlYuu27WNj+SoRoBiCqk9whp4Fyg0SOoPA="; }; nativeBuildInputs = [ jq ]; - buildInputs = [ wofi wtype wl-clipboard ]; + buildInputs = [ + wofi + wtype + wl-clipboard + ]; postPatch = '' substituteInPlace build.sh \ @@ -44,12 +59,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; homepage = "https://github.com/Zeioth/wofi-emoji"; - license = licenses.mit; - maintainers = [ maintainers.ymarkus ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ johnrtitor ymarkus ]; + platforms = lib.platforms.all; mainProgram = "wofi-emoji"; }; } diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index ee679a630b60b..378db968c9bb2 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -32,14 +32,14 @@ assert (x11Support || waylandSupport); stdenv.mkDerivation (finalAttrs: { pname = "yambar"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; rev = finalAttrs.version; - hash = "sha256-+bNTEPGV5xaVXhsejyK+FCcJ9J06KS6x7/qo6P2DnZI="; + hash = "sha256-QCwwMpBYuMWYqxE2ugPFpG/QtZDW7VsSBYs5EqKYejA="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d78943a5c5c26..20e987facdc3c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -272,15 +272,6 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "124.0.6367.118") [ - # M124 < 124.0.6367.118 shipped with broken --ozone-platform-hint flag handling, which we rely on - # for our NIXOS_OZONE_WL (wayland) environment variable. - # See <https://issues.chromium.org/issues/329678163>. - # This is the commit for the fix that landed in M125, which applies clean on M124. - (githubPatch { - commit = "c7f4c58f896a651eba80ad805ebdb49d19ebdbd4"; - hash = "sha256-6nYWT2zN+j73xAIXLdGYT2eC71vGnGfiLCB0OwT0CAI="; - }) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 345370868d715..f6f435d4aba44 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -28,12 +28,12 @@ version = "2024-03-14"; }; ungoogled-patches = { - hash = "sha256-1/J3BhUlef8CH/jZ5P5fWGXnWxTiuB0Ep+AWrMrv9cE="; - rev = "124.0.6367.91-1"; + hash = "sha256-Oo3+LCQYRRLsCQRLF+2+5tw3vMt0XYHlM4jTiapp9E8="; + rev = "124.0.6367.118-1"; }; }; - hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA="; - hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY="; - version = "124.0.6367.91"; + hash = "sha256-+r/48dxipSAo74v1deMuKalW+Hj85hCun63ZcgLYDLk="; + hash_deb_amd64 = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY="; + version = "124.0.6367.118"; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 442f899920c1f..7adcec1045618 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.6.3271.61"; + version = "6.7.3329.17"; 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-Rcc/pufINOQJlkQI6KkWVZtnh3KvKLS6jRWQNTxPFmU="; - x86_64-linux = "sha256-Xt4pLB23VZ/j9g/QCOQTrrhQduxs1nB4wyYkBefFPIQ="; + aarch64-linux = "sha256-G/KZ3BMn3nX+8hFmfZaYEo2hB/0GUxM3M4JwLzTglr0="; + x86_64-linux = "sha256-LH1/xalmKvZWKUWULWsJPz7YfPfISjiH+Tbx0Nj4VRY="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index f61bb393bac7c..59e0f843648ed 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.4.0"; + version = "2024.4.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-1/3uj0h9n53j8PnZSHWEyMARsWYxFIqSkGlxS2JXqsM="; + hash = "sha256-rDw25kFiD16xma/LozGjlc/Tm6hoRYzHs8spTk6HU6Y="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 3eee88fa2ad5c..799633712128b 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "atlantis"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - hash = "sha256-OAIxBCfSDNauThC4/W//DmkzwwsNGZxdj3gDjSWmoNU="; + hash = "sha256-BC4WSyKnDM9RhM+2iU9dBZLbtxDM/UoMmIDTP6DB3no="; }; ldflags = [ "-X=main.version=${version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-ppg8AFS16Wg/J9vkqhiokUNOY601kI+oFSDI8IDJTI4="; + vendorHash = "sha256-6Di8XLX1rOjVnIA+5kQB59aZ3qRmkjciWD0+GD9Lpzw="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 5f358587c4a48..46fe219868eff 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.29"; + version = "0.3.30"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-SYMgImnNqkP0A8EzR2btpVPb37G4Oxyb+Am//lXxTxU="; + hash = "sha256-iseyvGo9fitt8bAlbU3wF7bBLz66fijb8h35aank+0k="; }; - vendorHash = "sha256-NOXySV9sQl4Q1eDbcGMk0msMSosjyxYyJfhu7hd/4gw="; + vendorHash = "sha256-YpCn7hZkMj3/dIC/ZMslTjXcumCH3LH/A7pjfJ0pUd4="; CGO_ENABLED = 0; @@ -22,12 +22,12 @@ buildGoModule rec { "-X main.date=1970-01-01-00:00:01" ]; - meta = with lib; { + meta = { description = "Giving Kubernetes Superpowers to everyone"; mainProgram = "k8sgpt"; homepage = "https://k8sgpt.ai"; changelog = "https://github.com/k8sgpt-ai/k8sgpt/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ developer-guy kranurag7 ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ developer-guy kranurag7 ]; }; } diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 4b75b292fd3fd..56e14d7a15319 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-5aOAQ5kRnNsCn5EH9RKoeEfcFB3g59eqYIdSNjQxdjM="; + hash = "sha256-0Aq4/4b98A7ChbYDwnaXWJvZxrNyWKIFgyXde2deLXg="; }; - vendorHash = "sha256-5aGcDO+dV9XinH0vw6uNB0mnWuFQcyLhRB7zYr+sRfg="; + vendorHash = "sha256-oo/vQ6kAcEiKvy/eJ3kobdMyFxysfiArvy8aQDMmdo0="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index b50320d7c1a06..9bbdb64e95dd6 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.14.1"; + version = "3.14.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-TMKixwZonYGPXIqOtgnuilbH7BaIRyqJU6uKtp9ANKM="; + hash = "sha256-bs/16MEZZOv+5cfr35HDqhnJxza9mQfjd8ALjJifRf8="; }; - vendorHash = "sha256-Hl01dFSffYv59zensKTjXWLXxwfkQYAO5xadlc5iBJY="; + vendorHash = "sha256-eLLWzVQ9ANIWSdqjmggrboCwcUKVGdrJD2coCLmzAK4="; subPackages = ["cmd"]; @@ -58,12 +58,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { description = "SDK for building Kubernetes APIs using CRDs"; mainProgram = "kubebuilder"; homepage = "https://github.com/kubernetes-sigs/kubebuilder"; changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ cmars ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cmars ]; }; } diff --git a/pkgs/applications/networking/cluster/kubectl-explore/default.nix b/pkgs/applications/networking/cluster/kubectl-explore/default.nix index 84d1dfdd6dcd3..2a0016e020180 100644 --- a/pkgs/applications/networking/cluster/kubectl-explore/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-explore/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-explore"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "keisku"; repo = "kubectl-explore"; rev = "v${version}"; - hash = "sha256-3Gb8lgfes3QIIAdJnC/NlCC3mfzIInQb1rG+mJNXAUk="; + hash = "sha256-OPZ0FQl++AxxZUMAdwg3+cr1KrwYNWs8n8UQ4oVrLBw="; }; vendorHash = "sha256-xNB+qC36DcD7oUWk242QcIKNfTmjuK5xbyJEztdhcJM="; diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 14df6fa5c47d0..a338867a14a07 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-Z+IXSmN1V0xRnhE/PpWv9dQIwfTztJRYaftY9KCIucc="; + hash = "sha256-6HZc4PxgTLROn1nQLreC/GP43/MXiqtiSAGsMfXC5vw="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 4d9894d47c122..b80e2726bffc8 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-hFRqhw1iV9S13NQ7Y9SPeHHWZ/ls9fiiqlP3vuPeRlY="; + hash = "sha256-2x5xLh+v1/RXG3h93Ff49pT9NwHWNx4tubnmCf0SAdY="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 451e209a7b36f..1694359a02b24 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-RF8JEmZpvUf8w89wRa+d3ItMFnInEoxxQzLJvrx1mZE="; + hash = "sha256-9ykJMK51fm36sbICyuHJR7dSRnwIHhaQV2foKOuFmz0="; }; vendorHash = "sha256-bAB2vMPHIcJaMobPukQyKiCq0Af0n4b5mjImTswGFTo="; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 628084f6f31ea..9936580f3cc22 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.19.1"; + version = "5.19.4"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-6TOHDjR5sFaIeR6Zuf4azQAIgUyev7vdlAKB7YNk8R0="; + hash = "sha256-PhP3ILOYv+7gmxOJLCgIYp+1FIJirZo7TZJoZv8A1WM="; }; - vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14="; + vendorHash = "sha256-EVlYhlEXwgUfRaxAJ3dBTz6MJ2QITZtnHVcQQN1cHbk="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 526b7666db0eb..8c658f40eb763 100644 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ b/pkgs/applications/networking/cozy-drive/default.nix @@ -5,11 +5,11 @@ let pname = "cozydrive"; - version = "3.38.0"; + version = "3.39.0"; src = fetchurl { url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; - sha256 = "3liOzZVOjtV1cGrKlOKiFRRqnt8KHPr5Ye5HU0e/BYo="; + sha256 = "sha256-mTRg8KQm7BJil81TClyzCrXSHTbn+G9pRYMIaeXojzc="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 5ae116115e227..691d71e0decf3 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock +++ b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock @@ -31,14 +31,20 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] name = "alloc-no-stdlib" version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -83,22 +89,46 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "article_scraper" -version = "2.0.0" -source = "git+https://gitlab.com/news-flash/article_scraper.git#0dcebe8b49b8d867810d0f7ff155e502f637bb96" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f3fa375ebee9245309680ef4b2178782a9ac5e7b1f7bf869cff93f8f3c55c6" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "chrono", "encoding_rs", "escaper", @@ -117,9 +147,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b22517ee647547c01a687cf9b76074e1c91334032a4324f7243c6ee0f949390" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ "async-fs", "async-net", @@ -199,9 +229,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", "cfg-if", @@ -267,13 +297,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -302,13 +332,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -324,10 +354,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -377,9 +430,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitstream-io" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" [[package]] name = "block" @@ -440,9 +499,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -460,10 +519,16 @@ dependencies = [ ] [[package]] +name = "built" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" + +[[package]] name = "bumpalo" -version = "3.15.3" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecount" @@ -473,9 +538,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -485,9 +550,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytesize" @@ -501,7 +566,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", @@ -530,9 +595,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -552,9 +617,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +dependencies = [ + "jobserver", + "libc", +] [[package]] name = "cfg-expr" @@ -580,9 +649,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", @@ -619,11 +688,11 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "commafeed_api" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013b56b25f5e10cae0fac4564fd64aa54766a860b896fc2d582f97616be6e92c" +checksum = "072ba524ee8f89cf270c0f0fecd79062c094cd1c7f9c657c32810f9448d2b002" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "chrono", "log", "reqwest", @@ -814,9 +883,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.1.4" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8" +checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559" dependencies = [ "bigdecimal", "chrono", @@ -835,14 +904,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" +checksum = "5d02eecb814ae714ffe61ddc2db2dd03e6c49a42e269b5001355500d431cce0c" dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -862,7 +931,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -959,10 +1028,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -983,7 +1052,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1096,9 +1165,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -1122,16 +1191,16 @@ dependencies = [ "regex", "serde", "serde_json", - "siphasher 1.0.0", + "siphasher 1.0.1", "url", "uuid", ] [[package]] name = "feedbin_api" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e548b6bc1c89c0c92d269bccd154c9052e423c45fb950770077374be1b6b9749" +checksum = "3ba7c314a5931e0ed0444098689eec5955f0bce5a18f79a7c1e5f7dff8ef0f19" dependencies = [ "chrono", "reqwest", @@ -1144,9 +1213,9 @@ dependencies = [ [[package]] name = "feedly_api" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36971ec64540957e96aaa419c5e6026dd9704f8e587d7e42c25ec35580ac9eb2" +checksum = "57407ab65755d1bb234713057fb9400ef48a25627299577c527e816343584696" dependencies = [ "chrono", "log", @@ -1162,9 +1231,9 @@ dependencies = [ [[package]] name = "fever_api" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144611f6ff1f24937d3591684495c6c929872fe88dd73e2bbf050e415a0ef566" +checksum = "366649dc49e140910959d127d0db7a552f543138110fb32a246efa0e8d4aa57e" dependencies = [ "log", "md5", @@ -1295,9 +1364,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "fastrand", "futures-core", @@ -1314,7 +1383,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1374,9 +1443,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1389,9 +1458,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1463,9 +1532,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" dependencies = [ "futures-channel", "futures-core", @@ -1494,11 +1563,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1516,15 +1585,15 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1579,9 +1648,9 @@ dependencies = [ [[package]] name = "greader_api" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "787d011b04b4e309822ce9d02e4a61cd9f8a5b37ea019bb853f37bf1a3f06dde" +checksum = "18ab2555b8d1c4a12606d1b2caff3f30b77bc5935fe7623f735b704c241632b9" dependencies = [ "chrono", "log", @@ -1595,9 +1664,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ "cairo-rs", "gdk4", @@ -1610,9 +1679,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1626,9 +1695,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ "cairo-rs", "field-offset", @@ -1647,9 +1716,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", "proc-macro-crate", @@ -1661,9 +1730,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1680,9 +1749,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" dependencies = [ "bytes", "fnv", @@ -1709,9 +1778,9 @@ dependencies = [ [[package]] name = "hard-xml" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafc2bcb74049535eb6fab49eb20164a427867a9e809516ef95a98e961164432" +checksum = "a344e0cef8802f37dc47f17c01a04354d3e66d9f6c8744108b0912f616efe266" dependencies = [ "hard-xml-derive", "jetscii", @@ -1722,11 +1791,11 @@ dependencies = [ [[package]] name = "hard-xml-derive" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a345b327da51b997c94f841d9db6b2d292c7632713bd8a1b8b191e8b819df7" +checksum = "1bfae7cdfe23e50ea96929ccf1948d9ae1d8608353556461e5de247463d3a4f6" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "proc-macro2", "quote", "syn 1.0.109", @@ -1745,6 +1814,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] name = "hermit-abi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1757,6 +1832,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] name = "hostname" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1799,9 +1919,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1810,12 +1930,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] @@ -1826,12 +1958,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1839,39 +1965,58 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1929,23 +2074,44 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", - "jpeg-decoder", + "image-webp", "num-traits", "png", "qoi", + "ravif", + "rayon", + "rgb", "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "thiserror", ] [[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] name = "indenter" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1953,15 +2119,26 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", ] [[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + +[[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2042,13 +2219,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -2110,6 +2293,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] name = "libm" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2121,16 +2315,16 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall", ] [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "pkg-config", "vcpkg", @@ -2235,6 +2429,15 @@ dependencies = [ ] [[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] name = "lru-cache" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2314,6 +2517,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] name = "md-5" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2384,11 +2597,11 @@ dependencies = [ [[package]] name = "miniflux_api" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "babaa4cdaadf81050c03f93f16375cf305a29b2d6f099d66ff40aae93afcfee2" +checksum = "2e6e3b827f7d7e0b921d129e27e2621d317bb38005e0f2512092aa33435e5dc0" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "log", "reqwest", "serde", @@ -2399,6 +2612,12 @@ dependencies = [ ] [[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] name = "miniz_oxide" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2469,19 +2688,19 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "news-flash" version = "2.3.0-alpha.0" -source = "git+https://gitlab.com/news_flash/news_flash.git#46cf25eff46655e314ae38b28c04f0f943b3910a" +source = "git+https://gitlab.com/news_flash/news_flash.git#689cf86ca5eaa4f0aad85d99e7fb0184a2794a96" dependencies = [ "article_scraper", "async-trait", - "base64 0.21.7", - "bitflags 2.4.2", + "base64 0.22.0", + "bitflags 2.5.0", "bytes", "chrono", "commafeed_api", @@ -2538,7 +2757,6 @@ dependencies = [ "feedly_api", "futures", "futures-util", - "gdk-pixbuf", "gdk4", "gettext-rs", "gio", @@ -2570,8 +2788,8 @@ dependencies = [ [[package]] name = "newsblur_api" -version = "0.2.0" -source = "git+https://gitlab.com/news-flash/newsblur_api.git#5e7d06f357159d3623964b6b56c7672457c14340" +version = "0.3.0" +source = "git+https://gitlab.com/news-flash/newsblur_api.git#1e2b41e52a19e28c41a981fca6823f9447d82df4" dependencies = [ "reqwest", "serde", @@ -2582,11 +2800,11 @@ dependencies = [ [[package]] name = "nextcloud_news_api" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488e5fb51484deb6bc5bc22f0b0db4902ae7e391d075f8d1a1b9a9674ea326d3" +checksum = "97ddbef370f5a6964ba87d2c93d40bcf1f017981d18337a5e177a769bd8c38e1" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "log", "reqwest", "serde", @@ -2603,7 +2821,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "cfg_aliases", "libc", @@ -2611,6 +2829,22 @@ dependencies = [ ] [[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] name = "num-bigint" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2628,6 +2862,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + +[[package]] name = "num-integer" version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2637,6 +2882,18 @@ dependencies = [ ] [[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2717,7 +2974,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -2734,7 +2991,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2793,9 +3050,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ "gio", "glib", @@ -2845,6 +3102,12 @@ dependencies = [ ] [[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2889,6 +3152,26 @@ dependencies = [ ] [[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + +[[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2932,12 +3215,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", "rustix", "tracing", @@ -2997,14 +3281,33 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.55", +] + +[[package]] name = "psl-types" version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3026,7 +3329,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "memchr", "unicase", ] @@ -3062,6 +3365,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] name = "quick-xml" version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3131,19 +3440,69 @@ dependencies = [ ] [[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error 2.0.1", + "rav1e", + "rayon", + "rgb", +] + +[[package]] name = "raw-cpuid" version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3187,9 +3546,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -3216,9 +3575,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "e333b1eb9fe677f6893a9efcb0d277a2d3edd83f358a236b657c32301dc6e5f6" dependencies = [ "async-compression", "base64 0.21.7", @@ -3229,10 +3588,13 @@ dependencies = [ "futures-core", "futures-util", "h2", + "hickory-resolver", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -3253,7 +3615,6 @@ dependencies = [ "tokio-socks", "tokio-util", "tower-service", - "trust-dns-resolver", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -3269,7 +3630,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", - "quick-error", + "quick-error 1.2.3", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", ] [[package]] @@ -3293,7 +3663,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.52", + "syn 2.0.55", "walkdir", ] @@ -3324,11 +3694,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -3452,7 +3822,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3474,7 +3844,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3500,9 +3870,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.32" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ "indexmap", "itoa", @@ -3571,6 +3941,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3578,9 +3957,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skeptic" @@ -3608,9 +3987,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -3702,9 +4081,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", @@ -3740,14 +4119,14 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", - "toml 0.8.10", + "toml 0.8.12", "version-compare", ] @@ -3765,9 +4144,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -3803,22 +4182,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3924,7 +4303,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3977,14 +4356,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -4022,9 +4401,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", @@ -4034,6 +4413,28 @@ dependencies = [ ] [[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4045,6 +4446,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4058,7 +4460,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -4077,52 +4479,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" [[package]] -name = "trust-dns-proto" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - -[[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4195,9 +4551,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" @@ -4219,14 +4575,25 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", ] [[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4234,9 +4601,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -4290,7 +4657,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-shared", ] @@ -4324,7 +4691,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4710,6 +5077,12 @@ dependencies = [ ] [[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] name = "zune-inflate" version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4719,6 +5092,15 @@ dependencies = [ ] [[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] + +[[package]] name = "zvariant" version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index e6bc4c841c172..38ca720498ebb 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitLab +, substituteAll , cargo , meson , ninja @@ -25,21 +26,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "3.1.6"; + version = "3.2.0"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-zEf61aKtiuTCmhzkfVkTLtIRCb4DVXVtI+9Az9dU9HE="; + hash = "sha256-buXFQ/QAFOcdcywlacySuq8arqPEJIti1nK+yl3yWck="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "news-flash-2.3.0-alpha.0" = "sha256-Gr7EyAbIFABZx9GR/WvshF0vfJaul7wz4pro2EbwSM8="; - "newsblur_api-0.2.0" = "sha256-eysCB19znQF8mRwQ64nSp6KuvJ1Trot4g4WCdQDedo8="; - "article_scraper-2.0.0" = "sha256-URiteEJ1kXoGfRopGoRI/4iPbzd+F9bQaMJKpkrh/sE="; + "news-flash-2.3.0-alpha.0" = "sha256-WITvnqeEDp793AlZ3gj8Tg0dfccuOj0Us5H5FaEtkxk="; + "newsblur_api-0.3.0" = "sha256-m2178zdJzeskl3BQpZr6tlxTAADehxz8uYcZzi15nhQ="; }; }; @@ -50,6 +50,12 @@ stdenv.mkDerivation (finalAttrs: { # be included in $out. They will generated by xdg.mime.enable & # gtk.iconCache.enable instead. ./no-post-install.patch + + # Replace placeholder "0.0.0" project version with nixpkgs version + (substituteAll { + src = ./hardcode-version.patch; + inherit (finalAttrs) version; + }) ]; postPatch = '' diff --git a/pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch b/pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch new file mode 100644 index 0000000000000..972ec7464e08f --- /dev/null +++ b/pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index 55a5048a..1c648189 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project( + 'newsflash', 'rust', +- version: '0.0.0', ++ version: '@version@', + license: 'GPLv3', + ) + diff --git a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock index 8d77d6a44c59b..336cfeb7c00aa 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -41,21 +41,20 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "zeroize", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -65,14 +64,20 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] name = "allocator-api2" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -107,10 +112,20 @@ dependencies = [ ] [[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "anymap2" @@ -120,16 +135,33 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "aquamarine" -version = "0.3.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -155,15 +187,13 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" [[package]] name = "ashpd" -version = "0.6.7" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ "enumflags2", "futures-channel", "futures-util", - "libc", - "once_cell", "pipewire", "rand", "serde", @@ -182,32 +212,34 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" dependencies = [ "flate2", "futures-core", @@ -218,38 +250,18 @@ dependencies = [ [[package]] name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.2.2" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -266,12 +278,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -283,30 +295,33 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock 3.3.0", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.28", - "windows-sys 0.48.0", + "event-listener 5.3.0", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -325,13 +340,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -356,24 +371,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -396,9 +411,32 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] [[package]] name = "backoff" @@ -416,9 +454,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -437,9 +475,15 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -449,22 +493,23 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bindgen" -version = "0.66.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "annotate-snippets", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -481,21 +526,30 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" -version = "3.2.0" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" + +[[package]] +name = "bitstream-io" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -535,35 +589,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", "tracing", ] [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "tinyvec", ] [[package]] +name = "built" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" + +[[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -573,9 +633,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytesize" @@ -585,23 +645,22 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.18.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -619,10 +678,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" dependencies = [ + "jobserver", "libc", ] @@ -637,9 +697,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -664,6 +724,12 @@ dependencies = [ ] [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "chacha20" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -688,16 +754,10 @@ dependencies = [ ] [[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.31" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -705,7 +765,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -721,9 +781,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -774,9 +834,12 @@ dependencies = [ [[package]] name = "cookie-factory" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] [[package]] name = "core-foundation" @@ -796,63 +859,55 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.9" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.16" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", ] [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -894,9 +949,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -918,77 +973,42 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", + "syn 2.0.58", ] [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" 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", - "strsim", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.14.4", + "darling_core", "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.41", + "syn 2.0.58", ] [[package]] @@ -1047,14 +1067,14 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "der_derive", @@ -1071,14 +1091,14 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1097,33 +1117,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.14.4", + "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "derive_builder_macro" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -1146,7 +1166,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -1157,9 +1177,9 @@ checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -1188,9 +1208,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", @@ -1203,9 +1223,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1230,18 +1250,24 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -1249,13 +1275,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -1282,9 +1308,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1293,9 +1319,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1308,15 +1334,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", "pin-project-lite", ] [[package]] name = "exr" -version = "1.71.0" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", @@ -1354,14 +1390,16 @@ dependencies = [ [[package]] name = "eyeball-im-util" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191adac85d269e80f4e44c2b3e8fc2b193b2e3574a997962066b5980cab1fcc1" +checksum = "c0fea22ab33f31f2fac1a3a81b9024b461e28518f3262fecb6156943221e9960" dependencies = [ + "arrayvec", "eyeball-im", "futures-core", "imbl", "pin-project-lite", + "smallvec", ] [[package]] @@ -1385,29 +1423,20 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1424,9 +1453,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" [[package]] name = "field-offset" @@ -1434,15 +1463,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] [[package]] name = "flagset" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" +checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" [[package]] name = "flate2" @@ -1495,7 +1524,7 @@ dependencies = [ [[package]] name = "fractal" -version = "6.0.0" +version = "7.0.0" dependencies = [ "ashpd", "djb_hash", @@ -1514,8 +1543,8 @@ dependencies = [ "html-escape", "html2pango", "html5gum", - "image 0.24.7", - "indexmap 2.1.0", + "image", + "indexmap 2.2.6", "libadwaita", "libshumate", "matrix-sdk", @@ -1524,7 +1553,7 @@ dependencies = [ "mime_guess", "once_cell", "oo7", - "pulldown-cmark", + "pulldown-cmark 0.10.2", "qrcode", "rand", "regex", @@ -1554,25 +1583,41 @@ dependencies = [ ] [[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1581,63 +1626,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" -dependencies = [ - "futures-core", - "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1690,22 +1723,21 @@ checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" [[package]] name = "gdk-pixbuf" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ "gio-sys", "glib-sys", @@ -1716,9 +1748,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1731,9 +1763,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1748,25 +1780,23 @@ dependencies = [ [[package]] name = "gdk4-win32" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe66650c41f64e41ada9f85c4bdb96e5549c669e594892240dfb147a63256057" +checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" dependencies = [ "gdk4", "gdk4-win32-sys", "gio", "glib", "libc", - "system-deps", ] [[package]] name = "gdk4-win32-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b5c187546cd3ad9f1787b46c66272d8fcdf8197bfe4f6e2647fe910c39e396d" +checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" dependencies = [ - "gdk-pixbuf-sys", "gdk4-sys", "glib-sys", "libc", @@ -1786,9 +1816,9 @@ dependencies = [ [[package]] name = "geo-uri" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6b8812a079cb4a3b5b366c2d05db8e231e2f231c443acb3532daad996d89f71" +checksum = "ba35eb77ce72d7eefe4058c11cc816c6f9eb4f62ecc11c154b1d77d4d75399ce" dependencies = [ "derive_builder", "thiserror", @@ -1805,9 +1835,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1838,9 +1868,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1854,9 +1884,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.4" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" dependencies = [ "futures-channel", "futures-core", @@ -1865,7 +1895,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -1873,24 +1902,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.18.4" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e" +checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1902,30 +1931,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" dependencies = [ - "heck", - "proc-macro-crate 2.0.1", - "proc-macro-error", + "heck 0.5.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -1964,9 +1991,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -1975,9 +2002,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ "glib", "graphene-sys", @@ -1986,9 +2013,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ "glib-sys", "libc", @@ -2009,9 +2036,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ "cairo-rs", "gdk4", @@ -2024,9 +2051,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2040,10 +2067,11 @@ dependencies = [ [[package]] name = "gst-plugin-gtk4" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33970273495544e54d5f486d761b09d402f0cf8760990e1ea508bd5141f8ebeb" +checksum = "83c12132d3619f85db54f6034b4e3872577886657b07e055c521baeb2d5f6733" dependencies = [ + "async-channel", "gdk4-win32", "gst-plugin-version-helper", "gstreamer", @@ -2051,24 +2079,25 @@ dependencies = [ "gstreamer-gl", "gstreamer-video", "gtk4", - "windows-sys 0.48.0", + "once_cell", + "windows-sys 0.52.0", ] [[package]] name = "gst-plugin-version-helper" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334c37a15ca23861ad8159c8ff6e20f011aa2000defc5c9159096a28842f811b" +checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a" dependencies = [ "chrono", - "toml_edit 0.20.2", + "toml_edit 0.22.9", ] [[package]] name = "gstreamer" -version = "0.21.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed97f98d186e63e49079b26af1a1b73e70ab7a2f450eb46a136f2bffc2bf12d5" +checksum = "fc6f2d7dcde4b42b5297d25e9f51914cacfa148c99ba6ddabebf006fb2b18c20" dependencies = [ "cfg-if", "futures-channel", @@ -2076,24 +2105,24 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.11.0", + "itertools 0.12.1", "libc", "muldiv", "num-integer", - "num-rational 0.4.1", + "num-rational", + "once_cell", "option-operations", "paste", "pin-project-lite", - "pretty-hex", "smallvec", "thiserror", ] [[package]] name = "gstreamer-audio" -version = "0.21.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d1678eacb7677c1ffdcf220ada416b5fb68e87c33b77319f14bba169fbe3fc" +checksum = "73a5de9ced05f9650168a74c7a4afeddbf3e63af595a7d56a700765be3b4869c" dependencies = [ "cfg-if", "glib", @@ -2101,13 +2130,15 @@ dependencies = [ "gstreamer-audio-sys", "gstreamer-base", "libc", + "once_cell", + "smallvec", ] [[package]] name = "gstreamer-audio-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bd94ae8b177377855b38c3d809c686526786cdb771e6d68510509634b955d1" +checksum = "34d92a1e2a915874f70f0a33c3ea4589bc6b66a138b6ec8bb6acedf49bdec2c3" dependencies = [ "glib-sys", "gobject-sys", @@ -2119,9 +2150,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb150b6904a49052237fede7cc2e6479df6ced5043d95e6af8134bc141a3167f" +checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" dependencies = [ "atomic_refcell", "cfg-if", @@ -2133,9 +2164,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ca701f9078fe115b29b24c80910b577f9cb5b039182f050dbadf5933594b64" +checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" dependencies = [ "glib-sys", "gobject-sys", @@ -2146,9 +2177,9 @@ dependencies = [ [[package]] name = "gstreamer-gl" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ecfb91128263c160448a915a15e430cfdc69317b1b087316222e0693bb51b90" +checksum = "7d21c0c5fbf74018a0254b3ab77bca0a5b2c0f002bcfd910c09113ae90a95d98" dependencies = [ "glib", "gstreamer", @@ -2156,13 +2187,14 @@ dependencies = [ "gstreamer-gl-sys", "gstreamer-video", "libc", + "once_cell", ] [[package]] name = "gstreamer-gl-sys" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580971b3c99a667c9739812d499e6c5cadbb92873f984cd0d1d0b4e7346f1cd" +checksum = "61d1e3b9b02abc23835e9d770f2bd705b67a50406ea37e963b4526a77c6a7cd8" dependencies = [ "glib-sys", "gobject-sys", @@ -2175,9 +2207,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953055f80677b68b2f46f23859d9241df6b3dcf3ca8240db5f9ab50716255237" +checksum = "f173b14cdf3d10bc57d136797946fe2091c322015d879919765c317a0ea5edb3" dependencies = [ "glib", "gstreamer", @@ -2190,9 +2222,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6faae6e3454bc8ca5986d7ef6477fc44b809bfc952a8680eaedb4f2e001f9d69" +checksum = "6b3afcb1df3d217b2a6b00aa7a391a779764b5be6ccb7dcf35b5690279c61c5c" dependencies = [ "glib-sys", "gobject-sys", @@ -2205,9 +2237,9 @@ dependencies = [ [[package]] name = "gstreamer-play" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2efa4c3f92fa5d5e51e95c83f3b847c9ad16e3498a65beaf721d324187f04a" +checksum = "04cd4315d97f8f38a6a6fdaad27d51cc67fd132785816091ad9985e197d2c052" dependencies = [ "glib", "gstreamer", @@ -2218,9 +2250,9 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc41f9524b98e49da474696abd8fc026b0accfea7fd754e5be09107cb96038f" +checksum = "19def7b12d3a53c520ad661b8f4501ae04158627e4a9fc49cc30c4ea04522cbf" dependencies = [ "glib-sys", "gobject-sys", @@ -2232,9 +2264,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564cda782b3e6eed1b81cb4798a06794db56440fb05b422505be689f34ce3bc4" +checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" dependencies = [ "glib-sys", "gobject-sys", @@ -2244,9 +2276,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.21.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85b2a4d1d3b7a98ae03806c3ed5c2db89d6b37a5f138780b48de015d68715e5" +checksum = "5fc0a96481ecfcdd120d5057bb7ab5a6f6cd392cc34ba1e8b86cac3ba082f788" dependencies = [ "cfg-if", "futures-channel", @@ -2255,14 +2287,15 @@ dependencies = [ "gstreamer-base", "gstreamer-video-sys", "libc", + "once_cell", "thiserror", ] [[package]] name = "gstreamer-video-sys" -version = "0.21.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302318d98e6b054501e485b6bb4ee20225823218f4a8660c182f115a33b16ee" +checksum = "c1ea7996ba44fbbf563aeeda96e24259efc9f06b407854d837ee58e260d7ba78" dependencies = [ "glib-sys", "gobject-sys", @@ -2274,9 +2307,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ "cairo-rs", "field-offset", @@ -2295,12 +2328,12 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", "quote", @@ -2309,9 +2342,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -2328,9 +2361,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2338,7 +2371,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -2347,10 +2380,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] @@ -2362,15 +2396,6 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" @@ -2389,22 +2414,12 @@ dependencies = [ ] [[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -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", + "base64 0.21.7", "bytes", "headers-core", "http", @@ -2429,10 +2444,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2508,9 +2529,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -2548,9 +2569,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2563,7 +2584,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -2571,21 +2592,6 @@ 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.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2600,9 +2606,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2639,35 +2645,35 @@ dependencies = [ [[package]] name = "image" -version = "0.23.14" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-iter", - "num-rational 0.3.2", + "exr", + "gif", + "image-webp", "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", ] [[package]] -name = "image" -version = "0.24.7" +name = "image-webp" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" dependencies = [ - "bytemuck", "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational 0.4.1", - "num-traits", - "png", - "qoi", - "tiff", + "thiserror", ] [[package]] @@ -2686,14 +2692,20 @@ dependencies = [ [[package]] name = "imbl-sized-chunks" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076" +checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63" dependencies = [ "bitmaps", ] [[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] name = "include_dir" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2742,9 +2754,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2774,14 +2786,14 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "interpolate_name" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -2791,16 +2803,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 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.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2811,27 +2813,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jetscii" @@ -2840,19 +2833,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] -name = "jpeg-decoder" -version = "0.3.0" +name = "jobserver" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ - "rayon", + "libc", ] [[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2877,9 +2876,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -2941,9 +2940,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -2957,9 +2956,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -2973,18 +2972,29 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.4", ] [[package]] @@ -2995,9 +3005,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libshumate" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b743d27ff75bbd10e97729e771fa706f0e2e80503f8b737c7ebd39abd6ed1b2d" +checksum = "bd77c1202aaccef5460f4ca95b3b3c117f85986c942127e4e518c47058a6eaf6" dependencies = [ "gdk-pixbuf", "gdk4", @@ -3010,9 +3020,9 @@ dependencies = [ [[package]] name = "libshumate-sys" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d267a8d525823ad53986bde3b56ed6ef8c319227b33fc71028daed41ea5103" +checksum = "ef5765221e416ebe7b5e9c5bd7e8dd09ca9e920b012474ca8f3da18f8e13c4a5" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -3026,26 +3036,26 @@ dependencies = [ [[package]] name = "libspa" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434617020ddca18b86067912970c55410ca654cdafd775480322f50b857a8c4" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cc", "convert_case", "cookie-factory", "libc", "libspa-sys", - "nix", + "nix 0.27.1", "nom", "system-deps", ] [[package]] name = "libspa-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e70ca3f3e70f858ef363046d06178c427b4e0b63d210c95fd87d752679d345" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", "cc", @@ -3073,15 +3083,9 @@ dependencies = [ [[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.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "locale_config" @@ -3108,17 +3112,26 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "loop9" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] [[package]] name = "lru" -version = "0.9.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.3", ] [[package]] @@ -3147,7 +3160,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -3158,7 +3171,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -3171,7 +3184,7 @@ dependencies = [ "macroific_core", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -3217,9 +3230,8 @@ dependencies = [ [[package]] name = "mas-http" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6948721a2bc05e73f8029515e05b0c7deabb6fcec51ee7f033ecbfe60b7818" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "bytes", "futures-util", @@ -3227,8 +3239,6 @@ dependencies = [ "http", "http-body", "hyper", - "mas-tower", - "once_cell", "opentelemetry", "serde", "serde_json", @@ -3242,9 +3252,8 @@ dependencies = [ [[package]] name = "mas-iana" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c48820df73240471efb9fe90f90461b0029e4f0b7915e2df23633523635dfa3" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "schemars", "serde", @@ -3252,9 +3261,8 @@ dependencies = [ [[package]] name = "mas-jose" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39a251dfb34fb81d7259e91b368ee3551013406149333484ae30bd7da8c2c74" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "base64ct", "chrono", @@ -3282,39 +3290,9 @@ dependencies = [ ] [[package]] -name = "mas-keystore" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75c2a138f5805d21cf62c3947e23743349cb1303e8e3374aad14a5d571d7912" -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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3138f9b4240f515c740ec61e27b436f1fd5a24aabb66b51d93346c7d46e2e571" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "base64ct", "bytes", @@ -3323,49 +3301,24 @@ dependencies = [ "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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6beeba7843e755539b582e6240293db1e6bd428e22bc1a6ef4220b1fd2fc53d" -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" @@ -3390,17 +3343,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93779aa78d39c2fe34746287b10a866192cf8af1b81767fff76bd64099acc0f5" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "matrix-sdk" -version = "0.6.2" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "anymap2", "aquamarine", @@ -3413,7 +3366,7 @@ dependencies = [ "bytesize", "cfg-vis", "chrono", - "event-listener 4.0.0", + "event-listener 4.0.3", "eyeball", "eyeball-im", "eyeball-im-util", @@ -3422,9 +3375,10 @@ dependencies = [ "gloo-timers", "http", "hyper", - "image 0.24.7", + "image", "imbl", - "indexmap 2.1.0", + "indexmap 2.2.6", + "js_int", "language-tags", "mas-oidc-client", "matrix-sdk-base", @@ -3454,13 +3408,14 @@ dependencies = [ [[package]] name = "matrix-sdk-base" -version = "0.6.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "as_variant", "async-trait", - "bitflags 2.4.1", + "bitflags 2.5.0", "eyeball", + "eyeball-im", "futures-util", "matrix-sdk-common", "matrix-sdk-crypto", @@ -3476,8 +3431,8 @@ dependencies = [ [[package]] name = "matrix-sdk-common" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "async-trait", "futures-core", @@ -3498,8 +3453,8 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "aes", "as_variant", @@ -3514,7 +3469,8 @@ dependencies = [ "futures-util", "hkdf", "hmac", - "itertools 0.12.0", + "itertools 0.12.1", + "js_option", "matrix-sdk-common", "matrix-sdk-qrcode", "pbkdf2", @@ -3526,6 +3482,7 @@ dependencies = [ "sha2", "subtle", "thiserror", + "time", "tokio", "tokio-stream", "tracing", @@ -3536,17 +3493,16 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" -version = "0.2.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "anyhow", "async-trait", - "base64", + "base64 0.21.7", "getrandom", "gloo-utils", "indexed_db_futures", "js-sys", - "matrix-sdk-base", "matrix-sdk-crypto", "matrix-sdk-store-encryption", "ruma", @@ -3562,8 +3518,8 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" -version = "0.4.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "byteorder", "qrcode", @@ -3574,12 +3530,12 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" -version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "async-trait", "deadpool-sqlite", - "itertools 0.12.0", + "itertools 0.12.1", "matrix-sdk-base", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3596,13 +3552,13 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" -version = "0.2.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ + "base64 0.21.7", "blake3", "chacha20poly1305", "displaydoc", - "getrandom", "hmac", "pbkdf2", "rand", @@ -3616,8 +3572,8 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "as_variant", "async-once-cell", @@ -3633,8 +3589,8 @@ dependencies = [ "futures-util", "fuzzy-matcher", "imbl", - "indexmap 2.1.0", - "itertools 0.12.0", + "indexmap 2.2.6", + "itertools 0.12.1", "matrix-sdk", "matrix-sdk-base", "mime", @@ -3651,25 +3607,26 @@ dependencies = [ ] [[package]] -name = "memchr" -version = "2.6.4" +name = "maybe-rayon" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] [[package]] -name = "memoffset" -version = "0.7.1" +name = "memchr" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -3704,9 +3661,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -3714,9 +3671,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -3749,21 +3706,32 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", ] [[package]] @@ -3777,6 +3745,12 @@ dependencies = [ ] [[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3796,7 +3770,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational 0.4.1", + "num-rational", "num-traits", ] @@ -3831,39 +3805,44 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "autocfg", - "num-traits", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] -name = "num-iter" -version = "0.1.43" +name = "num-integer" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", - "num-integer", "num-traits", ] [[package]] -name = "num-rational" -version = "0.3.2" +name = "num-iter" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -3884,9 +3863,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3904,9 +3883,8 @@ dependencies = [ [[package]] name = "oauth2-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0c3fa3366856696f31b0686570dc4a511b499e648a03e433ad8b940ed2f122" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "chrono", "data-encoding", @@ -3954,9 +3932,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3969,44 +3947,36 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" +checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82" dependencies = [ - "aes", - "byteorder", - "cbc", - "cipher", - "digest", "futures-util", - "hkdf", - "hmac", "num", "num-bigint-dig", - "once_cell", - "pbkdf2", + "openssl", "rand", "serde", - "sha2", "tokio", "tracing", "zbus", "zeroize", + "zvariant", ] [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -4023,7 +3993,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -4034,9 +4004,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4046,13 +4016,12 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" dependencies = [ "futures-core", "futures-sink", - "indexmap 2.1.0", "js-sys", "once_cell", "pin-project-lite", @@ -4061,31 +4030,10 @@ dependencies = [ ] [[package]] -name = "opentelemetry-http" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" -dependencies = [ - "async-trait", - "bytes", - "http", - "opentelemetry", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry", -] - -[[package]] name = "opentelemetry_sdk" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" +checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" dependencies = [ "async-trait", "crossbeam-channel", @@ -4160,22 +4108,21 @@ dependencies = [ [[package]] name = "pango" -version = "0.18.3" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ "glib-sys", "gobject-sys", @@ -4214,28 +4161,27 @@ dependencies = [ [[package]] name = "parse-display" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c" +checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5" dependencies = [ - "once_cell", "parse-display-derive", "regex", + "regex-syntax 0.8.3", ] [[package]] name = "parse-display-derive" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" +checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790" dependencies = [ - "once_cell", "proc-macro2", "quote", "regex", - "regex-syntax 0.7.5", + "regex-syntax 0.8.3", "structmeta", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -4255,12 +4201,6 @@ dependencies = [ ] [[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] name = "pem-rfc7468" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4334,7 +4274,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -4357,29 +4297,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4394,22 +4334,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pipewire" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d009c8dd65e890b515a71950f7e4c801523b8894ff33863a40830bf762e9e9" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "libspa", "libspa-sys", - "nix", + "nix 0.27.1", "once_cell", "pipewire-sys", "thiserror", @@ -4417,9 +4357,9 @@ dependencies = [ [[package]] name = "pipewire-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890c084e7b737246cb4799c86b71a0e4da536031ff7473dd639eba9f95039f64" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", @@ -4438,21 +4378,6 @@ dependencies = [ ] [[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" @@ -4470,28 +4395,26 @@ 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.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4502,30 +4425,15 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.28", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -4560,12 +4468,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -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.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4586,12 +4488,20 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", ] [[package]] @@ -4620,18 +4530,37 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.58", +] + +[[package]] name = "prost" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", "prost-derive", @@ -4639,30 +4568,48 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", + "memchr", + "unicase", +] + +[[package]] +name = "pulldown-cmark" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" +dependencies = [ + "bitflags 2.5.0", "getopts", "memchr", + "pulldown-cmark-escape", "unicase", ] [[package]] +name = "pulldown-cmark-escape" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" + +[[package]] name = "qoi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4673,19 +4620,24 @@ dependencies = [ [[package]] name = "qrcode" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" +checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" dependencies = [ - "checked_int_cast", - "image 0.23.14", + "image", ] [[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -4730,10 +4682,60 @@ dependencies = [ ] [[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4741,9 +4743,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4766,14 +4768,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -4787,13 +4789,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -4804,24 +4806,18 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -4839,9 +4835,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -4867,17 +4865,12 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.17.7" +name = "rgb" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted", - "windows-sys 0.48.0", + "bytemuck", ] [[package]] @@ -4904,12 +4897,12 @@ dependencies = [ [[package]] name = "rqrr" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8b87d1f9f69bb1a6c77e20fd303f9617b2b68dcff87cd9bcbfff2ced4b8a0b" +checksum = "ad0cd0432e6beb2f86aa4c8af1bb5edcf3c9bcb9d4836facc048664205458575" dependencies = [ "g2p", - "image 0.24.7", + "image", "lru", ] @@ -4936,8 +4929,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2779c38df072964c63476259d9300efb07d0d1a7178c6469893636ce0c547a36" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "assign", "js_int", @@ -4953,9 +4945,9 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641837258fa214a70823477514954ef0f5d3bc6ae8e1d5d85081856a33103386" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ + "as_variant", "assign", "bytes", "http", @@ -4972,16 +4964,15 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bca4c33c50e47b4cdceeac71bdef0c04153b0e29aa992d9030ec14a62323e85" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "as_variant", - "base64", + "base64 0.21.7", "bytes", "form_urlencoded", "getrandom", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "js-sys", "js_int", "konst", @@ -4994,24 +4985,25 @@ dependencies = [ "serde_html_form", "serde_json", "thiserror", + "time", "tracing", "url", "uuid", + "web-time", "wildmatch", ] [[package]] name = "ruma-events" version = "0.27.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20a52770e5a9fb30b7a1c14ba8b3dcf76dadc01674e58e40094f78e6bd5e3f1" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "as_variant", - "indexmap 2.1.0", + "indexmap 2.2.6", "js_int", "js_option", "percent-encoding", - "pulldown-cmark", + "pulldown-cmark 0.9.6", "regex", "ruma-common", "ruma-html", @@ -5028,8 +5020,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1901c1f27bc327652d58af2a130c73acef3198abeccd24cee97f7267fdf3fe7" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "js_int", "ruma-common", @@ -5041,8 +5032,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9674a149b1a6965fe2174ba528c89ee201258abd9209bbe74953df7073a83a5b" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "as_variant", "html5ever", @@ -5054,8 +5044,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8ad1259274f2f57c20901bd1cc5e4a8f23169d1c1d887b6338b02f058e9b41" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "js_int", "thiserror", @@ -5064,24 +5053,22 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0280534a4b3e34416f883285fac4f9c408cd0b737890ae66f3e7a7056d14be80" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "once_cell", - "proc-macro-crate 2.0.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "ruma-identifiers-validation", "serde", - "syn 2.0.41", + "syn 2.0.58", "toml", ] [[package]] name = "ruma-push-gateway-api" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f343045c4d4a5943f93b5014160af3c7413e6ee32ea47b147e1e91f2a977486b" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "js_int", "ruma-common", @@ -5096,7 +5083,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5127,102 +5114,45 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -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.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", + "base64 0.21.7", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher", -] +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5231,10 +5161,13 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ + "chrono", "dyn-clone", + "indexmap 1.9.3", "schemars_derive", "serde", "serde_json", + "url", ] [[package]] @@ -5256,27 +5189,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scrypt" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" -dependencies = [ - "pbkdf2", - "salsa20", - "sha2", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5301,9 +5213,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5314,9 +5226,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -5324,24 +5236,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde-wasm-bindgen" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" dependencies = [ "js-sys", "serde", @@ -5350,22 +5262,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5381,12 +5293,12 @@ dependencies = [ [[package]] name = "serde_html_form" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224e6a14f315852940f3ec103125aa6482f0e224732ed91ed3330ed633077c34" +checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" dependencies = [ "form_urlencoded", - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -5394,10 +5306,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -5405,20 +5318,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -5437,16 +5350,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -5454,14 +5368,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ - "darling 0.20.3", + "darling", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5497,9 +5411,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" @@ -5527,6 +5441,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5543,35 +5466,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "sourceview5" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c5f976a113e947bc5ec67758b2960c0db4ca76f80fb410d7cd86cd456d9ee5" +checksum = "9f0bf70f2f1ac4624af22056f9c4cf58dccff73dafc7207b46fbd3df7b57410f" dependencies = [ "futures-channel", "futures-core", @@ -5587,9 +5500,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29637cccd56075a37ba72c0cc8b8d599dbc1d857e30dadea97eaacbc29b7fd46" +checksum = "eac236ad7ce6dad2b819ced8b68b5a1cf4d968aa301cb9a7692470eb21f657be" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -5667,47 +5580,47 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structmeta" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "structmeta-derive" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5729,9 +5642,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -5739,6 +5652,12 @@ dependencies = [ ] [[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] name = "system-configuration" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5761,12 +5680,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -5774,27 +5693,26 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", - "windows-sys 0.48.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -5810,29 +5728,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -5840,9 +5758,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -5851,12 +5769,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -5871,10 +5790,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -5895,9 +5815,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5906,7 +5826,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -5920,7 +5840,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5934,16 +5854,6 @@ dependencies = [ ] [[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.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5957,9 +5867,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5983,21 +5893,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.9", ] [[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", ] @@ -6008,22 +5918,44 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.2.6", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -6034,14 +5966,9 @@ 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", @@ -6053,17 +5980,14 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "iri-string", "pin-project-lite", - "tokio", - "tower", "tower-layer", "tower-service", ] @@ -6100,7 +6024,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -6126,9 +6050,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", @@ -6172,9 +6096,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6779a69cc5f9a7388274a0a8a353eb1c9e45195f9ae74a26690b055a7cf9592a" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" dependencies = [ "typewit_proc_macros", ] @@ -6191,18 +6115,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] [[package]] name = "ulid" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" +checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" dependencies = [ + "getrandom", "rand", + "web-time", ] [[package]] @@ -6216,9 +6142,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -6228,18 +6154,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -6258,12 +6184,6 @@ dependencies = [ ] [[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] name = "url" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6304,6 +6224,17 @@ dependencies = [ ] [[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6317,9 +6248,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -6329,13 +6260,12 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vodozemac" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c66c59f2218deeddfe34c0fee8a1908967f8566bafd91c3c6b9600d0b68cde1" +version = "0.5.1" +source = "git+https://github.com/matrix-org/vodozemac?rev=0c75746fc8a5eda4a0e490d345d1798b4c6cbd67#0c75746fc8a5eda4a0e490d345d1798b4c6cbd67" dependencies = [ "aes", "arrayvec", - "base64", + "base64 0.22.0", "cbc", "curve25519-dalek", "ed25519-dalek", @@ -6357,12 +6287,6 @@ dependencies = [ ] [[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] name = "want" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6379,9 +6303,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6389,24 +6313,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6416,9 +6340,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6426,28 +6350,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -6458,9 +6382,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6468,9 +6392,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6478,15 +6402,15 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wildmatch" -version = "2.1.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" +checksum = "939e59c1bc731542357fdaad98b209ef78c8743d652bb61439d16b16a79eb025" [[package]] name = "winapi" @@ -6512,11 +6436,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -6534,7 +6458,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -6554,17 +6478,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -6575,9 +6499,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -6587,9 +6511,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -6599,9 +6523,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -6611,9 +6535,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6623,9 +6547,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6635,9 +6559,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6647,15 +6571,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -6672,9 +6605,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", @@ -6684,9 +6617,9 @@ dependencies = [ [[package]] name = "x509-cert" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25eefca1d99701da3a57feb07e5079fc62abba059fc139e98c13bbb250f3ef29" +checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" dependencies = [ "const-oid", "der", @@ -6695,11 +6628,11 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix", + "libc", "winapi", ] @@ -6715,25 +6648,32 @@ dependencies = [ ] [[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] + +[[package]] name = "zbus" -version = "3.14.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "byteorder", "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.3.0", "futures-core", "futures-sink", "futures-util", "hex", - "nix", - "once_cell", + "nix 0.28.0", "ordered-stream", "rand", "serde", @@ -6743,7 +6683,7 @@ dependencies = [ "tokio", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -6752,11 +6692,11 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "regex", @@ -6766,9 +6706,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -6777,22 +6717,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -6812,10 +6752,16 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] name = "zune-inflate" version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6825,14 +6771,22 @@ dependencies = [ ] [[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] + +[[package]] name = "zvariant" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -6841,11 +6795,11 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6854,9 +6808,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 0ff8eadbf548d..cdbddfe9959a6 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -25,20 +25,23 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "6"; + version = "7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "GNOME"; + owner = "World"; repo = "fractal"; - rev = version; - hash = "sha256-J4Jb7G5Rfou3N7mytetIdLl0dGY5dSvTjnu8aj4kWXQ="; + rev = "refs/tags/${version}"; + hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "matrix-sdk-0.6.2" = "sha256-CY0Ylrd3NkP1IevyQa351IS/+evG2GgrjPnR/ZDFR9Q="; + "mas-http-0.8.0" = "sha256-IiYxF9qT/J/n8t/cVT/DRV3gl2MTA6/YfjshVIic/n4="; + "matrix-sdk-0.7.1" = "sha256-quwt9Dx0K6LDMwHBipc52Ek59zz5mlTAdOj+RXZBU3Q="; + "ruma-0.9.4" = "sha256-tp0EFS39UTXZJQPUDjeQixb8wzsMCzyFggVj6M8TRYg="; + "vodozemac-0.5.1" = "sha256-Hm0C696RmNX6n1Jx+hqkKMjpdbArliuzdiS4wCv3OIM="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a910105fde808..ec9f0d3691953 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.9.2"; + version = "5.10.0"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "sha256-W/60g5CbSUZcNASjdbiS7DNv9375GiesEG60QLLAh1g="; + sha256 = "sha256-zQhZlxr7kyMWx6txDnV+ECBTzVEwnUaBsLWKJy3XYFg="; }; meta = with lib; { description = "A free messaging app that combines chat & messaging services into one application"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 114b4a20e6409..0d46fea513518 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-BjXz2LwsvmJIaN+FZ4+mLu01jaajPvwf8YPqCjx7Kw4="; + hash = "sha256-GKKlcNcFPXslyjE7u5t+VLOiEXY8RYjYvBNL+WjpeeY="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index ba2f75669847c..588cd4326a61e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, makeWrapper +{ fetchurl, lib, stdenv, makeWrapper, buildEnv , pkg-config, gnupg , xapian, gmime3, sfsexp, talloc, zlib , doxygen, perl, texinfo @@ -12,14 +12,15 @@ , withEmacs ? true , withRuby ? true , withSfsexp ? true # also installs notmuch-git, which requires sexp-support +, withVim ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notmuch"; version = "0.38.3"; src = fetchurl { - url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; + url = "https://notmuchmail.org/releases/notmuch-${finalAttrs.version}.tar.xz"; hash = "sha256-mvRsyA2li0MByiuu/MJaQNES0DFVB+YywPPw8IMo0FQ="; }; @@ -76,8 +77,7 @@ stdenv.mkDerivation rec { ''; outputs = [ "out" "man" "info" "bindingconfig" ] - ++ lib.optional withEmacs "emacs" - ++ lib.optional withRuby "ruby"; + ++ lib.optional withEmacs "emacs"; # if notmuch is built with s-expression support, the testsuite (T-850.sh) only # passes if notmuch-git can be executed, so we need to patch its shebang. @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { moveToOutput bin/notmuch-emacs-mua $emacs '' + lib.optionalString withRuby '' make -C bindings/ruby install \ - vendordir=$ruby/lib/ruby \ + vendordir=$out/lib/ruby \ SHELL=$SHELL \ $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" @@ -133,12 +133,31 @@ stdenv.mkDerivation rec { + lib.optionalString withSfsexp '' cp notmuch-git $out/bin/notmuch-git wrapProgram $out/bin/notmuch-git --prefix PATH : $out/bin:${lib.getBin git}/bin + '' + lib.optionalString withVim '' + make -C vim DESTDIR="$out/share/vim-plugins/notmuch" prefix="" install + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/notmuch $out/share/nvim/site + '' + lib.optionalString (withVim && withRuby) '' + PLUG=$out/share/vim-plugins/notmuch/plugin/notmuch.vim + cat >> $PLUG << EOF + let \$GEM_PATH=\$GEM_PATH . ":${finalAttrs.passthru.gemEnv}/${ruby.gemPath}" + let \$RUBYLIB=\$RUBYLIB . ":$out/${ruby.libPath}/${ruby.system}" + if has('nvim') + EOF + for gem in ${finalAttrs.passthru.gemEnv}/${ruby.gemPath}/gems/*/lib; do + echo "ruby \$LOAD_PATH.unshift('$gem')" >> $PLUG + done + echo 'endif' >> $PLUG ''; passthru = { - pythonSourceRoot = "notmuch-${version}/bindings/python"; + pythonSourceRoot = "notmuch-${finalAttrs.version}/bindings/python"; + gemEnv = buildEnv { + name = "notmuch-vim-gems"; + paths = with ruby.gems; [ mail ]; + pathsToLink = [ "/lib" "/nix-support" ]; + }; tests.version = testers.testVersion { package = notmuch; }; - inherit version; updateScript = gitUpdater { url = "https://git.notmuchmail.org/git/notmuch"; @@ -155,4 +174,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "notmuch"; }; -} +}) diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index f31c214b190c1..85ef8b2130bba 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "flood"; - version = "4.8.0"; + version = "4.8.2"; src = fetchFromGitHub { owner = "jesec"; repo = pname; rev = "v${version}"; - hash = "sha256-hth8tk2DHuBGNAXdjknbdQinuwWJ//QF0e23neeTExw="; + hash = "sha256-Ejr0pmWIuYByzDS+iFTECO/aymzuJrJjaaW7HikNt2w="; }; - npmDepsHash = "sha256-WlQ/u7yIbuFETsmbW7ddAOO7OVrNPOXR3ja3N0aFWRE="; + npmDepsHash = "sha256-md76I7W5QQvfbOmk5ODssMtJAVOj8nvaJ2PakEZ8WUA="; meta = with lib; { description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index c986b4a62455c..c2c53faaf03a3 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-3KMmMDoaYYMKuuqLof/LfdCs1d4I70L2TDxmzvx4Vq0="; + x86_64-linux = "sha256-s6TZzgcmlQz4IYKWd+jrXtyTyQsW1w6MuM9ZkYJHtpE="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "9.0"; + version = "9.1"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index a77655588464b..9b80a93a70cb6 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.2.2"; + version = "3.4.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-+VvQM851uWoMXV3hwuVSlK9IqiNjh57uq8Wlwl/VvPg="; + hash = "sha256-GwvfnFQbeLiJHHiO0QpfPLdflUXe/q/QEsRVaF/3c4c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index fc88bf6b58817..3e6ed97d11c87 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2024-04-11"; + version = "0-unstable-2024-04-27"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "5e9e95a34221d4bda584d2130586177e29ee8fe7"; - sha256 = "X0aB0rJZd9G8S+QWviSAdB/YQMT4lVV3yiELzZs+P3g="; + rev = "fee4de37933f60895f78f45eb192d27bcdf0640e"; + hash = "sha256-ej8Pjz7gvVP8gVsC68h60/uy+CkrcrBflhW/PjsxCvM="; }; nativeBuildInputs = [ @@ -45,7 +45,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; }; meta = with lib; { diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index e62d26b3c9fcc..ee8f067b339f4 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -21,13 +21,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.0.8"; + version = "7.2.1"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-e3WNDB6P7kapAfzlvbJ1/6LcyH7Fl6GKCK/hri460pQ="; + sha256 = "sha256-CK3XkHX16Ec/j1DhC29uoj/YqcLXs/KsIb7v/cfoiaM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 2e9393dfedae7..4f3f21926f231 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.9"; + version = "2.6.10"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-DyBo56NS15s+t9Dl8xCC7MQAqMmZ91FYUYOV4vyJ/Yo="; + hash = "sha256-VPiv/Df4dasiYUBA6UHrxBczmGAqzhQkPrknzSYJxAE="; }; postPatch = '' diff --git a/pkgs/applications/radio/flamp/default.nix b/pkgs/applications/radio/flamp/default.nix index 4e7326af19326..fc44826258be1 100644 --- a/pkgs/applications/radio/flamp/default.nix +++ b/pkgs/applications/radio/flamp/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "flamp"; - version = "2.2.11"; + version = "2.2.12"; src = fetchgit { url = "https://git.code.sf.net/p/fldigi/flamp"; rev = "v${finalAttrs.version}"; - hash = "sha256-QYfTkciSbBLy49rF6xABMw8TXZ/0QyQ/yhJ2nuM7f/c="; + hash = "sha256-Rw75mz3gPQDBl1iECHZAMBxY8iDr/hqSJscJhdboaRw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 46a8c85d3a066..b8c5d69482e3a 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.5.0"; + version = "2.11.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-YLsyA+RVoFvjE4MfAtglJYdUgic487SxwdUhvolzBPc="; + sha256 = "sha256-MtcrkDg7OC3PTc6fdeG3O/CdyP3122+2BSzKE7rrtWI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 2c3963cecec99..552639de6c532 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gretl"; - version = "2023c"; + version = "2024a"; src = fetchurl { url = "mirror://sourceforge/gretl/gretl-${finalAttrs.version}.tar.xz"; - hash = "sha256-vTxCmHrTpYTo9CIPousUCnpcalS6cN1u8bRaOJyu6MI="; + hash = "sha256-6ha0d/n75Xf0hZM0GRHLOnM274P1h2MerB/8SHWTh+o="; }; buildInputs = [ diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 1e88047eba72c..6b5917e163287 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses -, libiconv, Security }: +, curl, libiconv, Security }: rustPlatform.buildRustPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; repo = "rink-rs"; rev = "v${version}"; - sha256 = "sha256-5UrSJ/y6GxDUNaljal57JJY17NuI+2yLwVTwp+xBNxs="; + hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o="; }; - cargoHash = "sha256-G30NcP1ej01ygHzaxZ2OdgfksvXe/SCsmZFwamxlDvA="; + cargoHash = "sha256-j1pQfMjDNu57otOBTVBQEZIx80p4/beEUQdUkAJhvso="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); + ++ (if stdenv.isDarwin then [ curl libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 9342e1833ac26..239d9a2fe0486 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 , glibcLocales , gobject-introspection @@ -10,22 +11,47 @@ , libutempter , vte , libwnck +, dconf , nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "guake"; - version = "3.9.0"; + version = "3.10"; - format = "other"; + pyproject = false; src = fetchFromGitHub { owner = "Guake"; repo = "guake"; rev = "refs/tags/${version}"; - sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; + hash = "sha256-e6Bf4HDftHBxFPcw9z02CqgZhSIvt6wlLF6dnIh9fEc="; }; + patches = [ + # Avoid trying to recompile schema at runtime, + # the package should be responsible for ensuring it is up to date. + # Without this, the package will try to run glib-compile-schemas + # on every update, which is pointless and will crash + # unless user has it installed. + ./no-compile-schemas.patch + + # Avoid using pip since it fails on not being able to find setuptools. + # Note: This is not a long-term solution, setup.py is deprecated. + (fetchpatch { + url = "https://github.com/Guake/guake/commit/14abaa0c69cfab64fe3467fbbea211d830042de8.patch"; + hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY= "; + revert = true; + }) + + # Revert switch to FHS. + (fetchpatch { + url = "https://github.com/Guake/guake/commit/8c7a23ba62ee262c033dfa5b0b18d3df71361ff4.patch"; + hash = "sha256-0asXI08XITkFc73EUenV9qxY/Eak+TzygRRK7GvhQUc="; + revert = true; + }) + ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 @@ -57,7 +83,11 @@ python3.pkgs.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}" + # For settings migration. + --prefix PATH : "${lib.makeBinPath [ dconf ]}" + ) ''; passthru.tests.test = nixosTests.terminal-emulators.guake; @@ -65,7 +95,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.msteen ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch b/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch new file mode 100644 index 0000000000000..e73387e1fc098 --- /dev/null +++ b/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch @@ -0,0 +1,34 @@ +diff --git a/guake/guake_app.py b/guake/guake_app.py +index 48074db..d7d1371 100644 +--- a/guake/guake_app.py ++++ b/guake/guake_app.py +@@ -109,12 +109,7 @@ class Guake(SimpleGladeApp): + SCHEMA_DIR, Gio.SettingsSchemaSource.get_default(), False + ) + +- try: +- schema_source = load_schema() +- except GLib.Error: # pylint: disable=catching-non-exception +- log.exception("Unable to load the GLib schema, try to compile it") +- try_to_compile_glib_schemas() +- schema_source = load_schema() ++ schema_source = load_schema() + self.settings = Settings(schema_source) + self.accel_group = None + +@@ -122,13 +117,8 @@ class Guake(SimpleGladeApp): + "schema-version" not in self.settings.general.keys() + or self.settings.general.get_string("schema-version") != guake_version() + ): +- log.exception("Schema from old guake version detected, regenerating schema") +- try: +- try_to_compile_glib_schemas() +- except subprocess.CalledProcessError: +- log.exception("Schema in non user-editable location, attempting to continue") +- schema_source = load_schema() +- self.settings = Settings(schema_source) ++ log.exception("Schema from old guake version detected") ++ # Kept for compatibility with other distros. + self.settings.general.set_string("schema-version", guake_version()) + + log.info("Language previously loaded from: %s", LOCALE_DIR) diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/applications/terminal-emulators/kitty/themes.nix index 1459642bc98a7..46993343bd53f 100644 --- a/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2023-12-28"; + version = "unstable-2024-04-23"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "46d9dfe230f315a6a0c62f4687f6b3da20fd05e4"; - hash = "sha256-jlYim4YXByT6s6ce0TydZuhX0Y1ZDcAq2XKNONisSzE="; + rev = "8026ce6ec70a0a67fedd02319e6fa39d36bbc1d1"; + hash = "sha256-RN4YTcsVRg+3c+SEtKkJC8EvuNiiToduASMy/Rr+ZwA="; }; dontConfigure = true; diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix index 62e9a12a49df6..5c7379c51a5d3 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wkayj7SvT3SOM+rol17+8LQJR/YXSC6I+iKbHRUbdZc="; + sha256 = "sha256-IpMaCG6kPNrWtcl10Lh7A3PyIF4Mk0t2wLYON+zMLsE="; }; propagatedBuildInputs = [ pyxdg ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 677467d343965..1a82cd1c19b9f 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, pugixml, glib, nspr, nss, gtest }: +{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, pugixml, glib, nspr, nss, gtest, rapidjson }: let bento4 = fetchFromGitHub { owner = "xbmc"; @@ -10,13 +10,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "21.4.4"; + version = "21.4.6"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-Nzlm1AW/nW9chQAourKF0o2FSQmsr1MNhJ4gEO0/9sM="; + sha256 = "sha256-ub4ep89datfr8aZLZAfoz7zhOizGFpzgp2PVON6Ptj8="; }; extraCMakeFlags = [ @@ -26,7 +26,7 @@ buildKodiBinaryAddon rec { extraNativeBuildInputs = [ gtest ]; - extraBuildInputs = [ pugixml ]; + extraBuildInputs = [ pugixml rapidjson ]; extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 6308a6470acdd..4184126842ba0 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "20.4.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-FKxoPD8t5JbouhvQtMVMFjk3O5zB9kVgrn0eC2RPDvQ="; + sha256 = "sha256-Hb8TcJxRUIKHbevAUgt5q6z26W3uX9NbVwYyvrLnf7U="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 28dd626502e80..59f39a06fd71e 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "20.13.0"; + version = "21.8.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-W/tFM/WpWdSvLEf0iwQoH2JVDjyfr1l8CRQkOG5q4hk="; + sha256 = "sha256-uuqk1kJnioCaRWIkC5liPSVRQPpviuaE+wmE4rq6fJw="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix b/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix index 4b5e8c6a7094f..9fdbee949d8fd 100644 --- a/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-vdr-vnsi"; namespace = "pvr.vdr.vnsi"; - version = "20.4.1"; + version = "21.1.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.vdr.vnsi"; rev = "${version}-${rel}"; - sha256 = "sha256-QooWK+LwlN5RAISjAQ2YiyDAjQQMzod8fFXpI0ll+hc="; + sha256 = "sha256-Bd/21y3oAhQMmvrZzrN5Z6jLHySBd2LXNbLt/Me4jSw="; }; extraBuildInputs = [ libGL ]; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index f2f340b257dbe..23c59d702e4d2 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.6"; + version = "7.0.6.3"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-pxW45D/tppUTTgeR5wVteOP2f4TZ4wl/9A5IBhOZhTM="; + hash = "sha256-MhVxaI/kZ/CCAcf6Mo4DXmXpCLpxxpBFGwmTBp3rKkI="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix index 037eda100611f..f58d81e9b706b 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.13.0"; + version = "4.13.2"; nativeBuildInputs = [ cmake qtbase ]; buildInputs = [ obs-studio qtbase ndi ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "Palakis"; repo = "obs-ndi"; rev = version; - sha256 = "sha256-ugAMSTXbbIZ61oWvoggVJ5kZEgp/waEcWt89AISrSdE="; + sha256 = "sha256-DVUoLV2jCdD8qXSpmGvqjrQh02dCLroKsUAb5+lYTog="; }; patches = [ diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index c3a28e4be4fe7..57dde74ab09f7 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.82.2"; + version = "1.82.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-2a8QBdL28iHVTE+Xo1I+89pFBeWndPqT072SHB498SQ="; + hash = "sha256-dn7aAH5Huul02WHoPm9VOjAdhMmtUXwnoGa2nSOa8UI="; }; vendorHash = null; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 8575c10a6ad64..b56127cc2948e 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-04-25"; + version = "0-unstable-2024-04-30"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "a3f074be78e77bab378f064452420923b6f9c331"; - hash = "sha256-D+ClEJL/iCLARaTXe5QpI/uHE61Lajzz5A5EphgHCl8="; + rev = "726ef446c89a75510311638a4892e97ad9e0fa4e"; + hash = "sha256-7OoCoZ4IHXYI73W93P9MzVGYFv/+MDcbbhPdJY9lD2M="; }; strictDeps = true; diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 80c63bcde71b9..5a21eda03544a 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -1,7 +1,17 @@ -{ callPackage, stdenvNoCC, lib, writeTextDir, php, makeBinaryWrapper, fetchFromGitHub, fetchurl }: +{ + callPackage, + stdenvNoCC, + lib, + writeTextDir, + php, + makeBinaryWrapper, + fetchFromGitHub, + fetchurl, +}: let - buildComposerProjectOverride = finalAttrs: previousAttrs: + buildComposerProjectOverride = + finalAttrs: previousAttrs: let phpDrv = finalAttrs.php or php; @@ -22,49 +32,58 @@ let phpDrv.composerHooks.composerInstallHook ]; - buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ - phpDrv - ]; + buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ]; patches = previousAttrs.patches or [ ]; strictDeps = previousAttrs.strictDeps or true; # Should we keep these empty phases? - configurePhase = previousAttrs.configurePhase or '' - runHook preConfigure + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure - runHook postConfigure - ''; + runHook postConfigure + ''; - buildPhase = previousAttrs.buildPhase or '' - runHook preBuild + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild - runHook postBuild - ''; + runHook postBuild + ''; doCheck = previousAttrs.doCheck or true; - checkPhase = previousAttrs.checkPhase or '' - runHook preCheck + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck - runHook postCheck - ''; + runHook postCheck + ''; - installPhase = previousAttrs.installPhase or '' - runHook preInstall + installPhase = + previousAttrs.installPhase or '' + runHook preInstall - runHook postInstall - ''; + runHook postInstall + ''; doInstallCheck = previousAttrs.doInstallCheck or false; - installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preInstallCheck + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck - runHook postInstallCheck - ''; + runHook postInstallCheck + ''; composerRepository = phpDrv.mkComposerRepository { inherit composer composer-local-repo-plugin; - inherit (finalAttrs) patches pname src vendorHash version; + inherit (finalAttrs) + patches + pname + src + vendorHash + version + ; composerLock = previousAttrs.composerLock or null; composerNoDev = previousAttrs.composerNoDev or true; @@ -73,9 +92,9 @@ let composerStrictValidation = previousAttrs.composerStrictValidation or true; }; - COMPOSER_CACHE_DIR="/dev/null"; - COMPOSER_DISABLE_NETWORK="1"; - COMPOSER_MIRROR_PATH_REPOS="1"; + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_DISABLE_NETWORK = "1"; + COMPOSER_MIRROR_PATH_REPOS = "1"; meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index e359c0829aaf7..a5b02fd95e04a 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -1,4 +1,11 @@ -{ callPackage, stdenvNoCC, lib, writeTextDir, fetchFromGitHub, php }: +{ + callPackage, + stdenvNoCC, + lib, + writeTextDir, + fetchFromGitHub, + php, +}: let mkComposerRepositoryOverride = @@ -22,12 +29,24 @@ let composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { }; in assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); - assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument."); + assert ( + lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument." + ); assert (lib.assertMsg (previousAttrs ? version) "mkComposerRepository expects version argument."); assert (lib.assertMsg (previousAttrs ? pname) "mkComposerRepository expects pname argument."); - assert (lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument."); - assert (lib.assertMsg (previousAttrs ? composerNoPlugins) "mkComposerRepository expects composerNoPlugins argument."); - assert (lib.assertMsg (previousAttrs ? composerNoScripts) "mkComposerRepository expects composerNoScripts argument."); + assert ( + lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument." + ); + assert ( + lib.assertMsg ( + previousAttrs ? composerNoPlugins + ) "mkComposerRepository expects composerNoPlugins argument." + ); + assert ( + lib.assertMsg ( + previousAttrs ? composerNoScripts + ) "mkComposerRepository expects composerNoScripts argument." + ); { composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; @@ -51,37 +70,42 @@ let strictDeps = previousAttrs.strictDeps or true; # Should we keep these empty phases? - configurePhase = previousAttrs.configurePhase or '' - runHook preConfigure + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure - runHook postConfigure - ''; + runHook postConfigure + ''; - buildPhase = previousAttrs.buildPhase or '' - runHook preBuild + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild - runHook postBuild - ''; + runHook postBuild + ''; doCheck = previousAttrs.doCheck or true; - checkPhase = previousAttrs.checkPhase or '' - runHook preCheck + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck - runHook postCheck - ''; + runHook postCheck + ''; - installPhase = previousAttrs.installPhase or '' - runHook preInstall + installPhase = + previousAttrs.installPhase or '' + runHook preInstall - runHook postInstall - ''; + runHook postInstall + ''; doInstallCheck = previousAttrs.doInstallCheck or false; - installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preInstallCheck + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck - runHook postInstallCheck - ''; + runHook postInstallCheck + ''; COMPOSER_CACHE_DIR = "/dev/null"; COMPOSER_MIRROR_PATH_REPOS = "1"; @@ -89,7 +113,8 @@ let COMPOSER_DISABLE_NETWORK = "0"; outputHashMode = "recursive"; - outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; + outputHashAlgo = + if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; outputHash = finalAttrs.vendorHash or ""; }; in diff --git a/pkgs/build-support/php/build-pecl.nix b/pkgs/build-support/php/build-pecl.nix index 6f38a668f3a34..16913a85c63de 100644 --- a/pkgs/build-support/php/build-pecl.nix +++ b/pkgs/build-support/php/build-pecl.nix @@ -1,45 +1,69 @@ -{ stdenv, lib, php, autoreconfHook, fetchurl, re2c, nix-update-script }: +{ + stdenv, + lib, + php, + autoreconfHook, + fetchurl, + re2c, + nix-update-script, +}: -{ pname -, version -, internalDeps ? [ ] -, peclDeps ? [ ] -, buildInputs ? [ ] -, nativeBuildInputs ? [ ] -, postPhpize ? "" -, makeFlags ? [ ] -, src ? fetchurl ({ - url = "https://pecl.php.net/get/${pname}-${version}.tgz"; - } // lib.filterAttrs (attrName: _: lib.elem attrName [ "sha256" "hash" ]) args) -, passthru ? { } -, ... +{ + pname, + version, + internalDeps ? [ ], + peclDeps ? [ ], + buildInputs ? [ ], + nativeBuildInputs ? [ ], + postPhpize ? "", + makeFlags ? [ ], + src ? fetchurl ( + { + url = "https://pecl.php.net/get/${pname}-${version}.tgz"; + } + // lib.filterAttrs ( + attrName: _: + lib.elem attrName [ + "sha256" + "hash" + ] + ) args + ), + passthru ? { }, + ... }@args: -stdenv.mkDerivation (args // { - name = "php-${pname}-${version}"; - extensionName = pname; +stdenv.mkDerivation ( + args + // { + name = "php-${pname}-${version}"; + extensionName = pname; - inherit src; + inherit src; - nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; - buildInputs = [ php ] ++ peclDeps ++ buildInputs; + nativeBuildInputs = [ + autoreconfHook + re2c + ] ++ nativeBuildInputs; + buildInputs = [ php ] ++ peclDeps ++ buildInputs; - makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; + makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; - autoreconfPhase = '' - phpize - ${postPhpize} - ${lib.concatMapStringsSep "\n" - (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") - internalDeps} - ''; - checkPhase = "NO_INTERACTON=yes make test"; + autoreconfPhase = '' + phpize + ${postPhpize} + ${lib.concatMapStringsSep "\n" ( + dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}" + ) internalDeps} + ''; + checkPhase = "NO_INTERACTON=yes make test"; - passthru = passthru // { - # Thes flags were introduced for `nix-update` so that it can update - # PHP extensions correctly. - # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 - isPhpExtension = true; - updateScript = nix-update-script {}; - }; -}) + passthru = passthru // { + # Thes flags were introduced for `nix-update` so that it can update + # PHP extensions correctly. + # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 + isPhpExtension = true; + updateScript = nix-update-script { }; + }; + } +) diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/hooks/default.nix index ca96b1056db9d..1bdc4d3e92805 100644 --- a/pkgs/build-support/php/hooks/default.nix +++ b/pkgs/build-support/php/hooks/default.nix @@ -1,11 +1,12 @@ -{ lib -, makeSetupHook -, diffutils -, jq -, writeShellApplication -, moreutils -, cacert -, buildPackages +{ + lib, + makeSetupHook, + diffutils, + jq, + writeShellApplication, + moreutils, + cacert, + buildPackages, }: let @@ -16,24 +17,30 @@ let }; in { - composerRepositoryHook = makeSetupHook - { - name = "composer-repository-hook.sh"; - propagatedBuildInputs = [ jq moreutils cacert ]; - substitutions = { - phpScriptUtils = lib.getExe php-script-utils; - }; - } ./composer-repository-hook.sh; + composerRepositoryHook = makeSetupHook { + name = "composer-repository-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-repository-hook.sh; - composerInstallHook = makeSetupHook - { - name = "composer-install-hook.sh"; - propagatedBuildInputs = [ jq moreutils cacert ]; - substitutions = { - # Specify the stdenv's `diff` by abspath to ensure that the user's build - # inputs do not cause us to find the wrong `diff`. - cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; - phpScriptUtils = lib.getExe php-script-utils; - }; - } ./composer-install-hook.sh; + composerInstallHook = makeSetupHook { + name = "composer-install-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-install-hook.sh; } diff --git a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index bfdc3d4f98d1b..5351a3e51f4dc 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -1,9 +1,14 @@ -{ php, callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }: +{ + php, + callPackage, + stdenvNoCC, + lib, + fetchFromGitHub, + makeBinaryWrapper, +}: let - composer = callPackage ./composer-phar.nix { - inherit (php.packages.composer) version pharHash; - }; + composer = callPackage ./composer-phar.nix { inherit (php.packages.composer) version pharHash; }; composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: { pname = "composer-keys"; @@ -43,13 +48,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { COMPOSER_HTACCESS_PROTECT = "0"; COMPOSER_DISABLE_NETWORK = "1"; - nativeBuildInputs = [ - makeBinaryWrapper - ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ - composer - ]; + buildInputs = [ composer ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index f281334ab2d9f..a03adc6e6ab0b 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -1,17 +1,17 @@ { - _7zz - , cacert - , curl - , fetchurl - , git - , lib - , makeBinaryWrapper - , php - , stdenvNoCC - , unzip - , xz - , version - , pharHash + _7zz, + cacert, + curl, + fetchurl, + git, + lib, + makeBinaryWrapper, + php, + stdenvNoCC, + unzip, + xz, + version, + pharHash, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -34,7 +34,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ - --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} + --prefix PATH : ${ + lib.makeBinPath [ + _7zz + cacert + curl + git + unzip + xz + ] + } runHook postInstall ''; diff --git a/pkgs/misc/ananicy-rules-cachyos/default.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index fba65999b0f93..7a146013a6d04 100644 --- a/pkgs/misc/ananicy-rules-cachyos/default.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -1,14 +1,18 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "unstable-2024-04-22"; + version = "unstable-2024-05-04"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "8646faa8c0c8fc16d78ca3a25d65ddbd86b9d468"; - hash = "sha256-b9M6Uqlb6Ysp8BRe1QV62sjVOU6tgFbrjTxDc3B4xlg="; + rev = "5276c6dd11966dcf6f9588c6148949837abb8200"; + hash = "sha256-we2kdQb5rSJldP0HxBLAR5czTc3aayWElp5vAfmQ4ag="; }; dontConfigure = true; @@ -27,6 +31,10 @@ stdenvNoCC.mkDerivation { description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ artturin johnrtitor diniamo ]; + maintainers = with lib.maintainers; [ + artturin + diniamo + johnrtitor + ]; }; } diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index a54c6b85ecb23..094249825dd65 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.40.0-49176"; + version = "1.41.0-49440"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-SjdlMEhmO00ADWTFR4u9fHKWbbQRAC/UstXIoshgYuA="; + hash = "sha256-+3XK94LX2UBof7cUpVzc4DTyp9xMH2v5n7LQD4gdANA="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix new file mode 100644 index 0000000000000..8c286ebff9e67 --- /dev/null +++ b/pkgs/by-name/ar/argc/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPackages, + pkgsCross, + rustPlatform, + stdenv, + fetchFromGitHub, + installShellFiles, +}: + +let + canExecuteHost = stdenv.buildPlatform.canExecute stdenv.hostPlatform; +in +rustPlatform.buildRustPackage rec { + pname = "argc"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "sigoden"; + repo = "argc"; + rev = "v${version}"; + hash = "sha256-Li/K5/SLG6JuoRJDz2DQoj1Oi9LQgZWHNvtZ1HVbj88="; + }; + + cargoHash = "sha256-D1T9FWTvwKtAYoqFlR2OmLRLGWhPJ9D8J7lq/QKcBoM="; + + nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; + + postInstall = '' + ARGC=${if canExecuteHost then ''''${!outputBin}/bin/argc'' else "argc"} + + installShellCompletion --cmd argc \ + --bash <("$ARGC" --argc-completions bash) \ + --fish <("$ARGC" --argc-completions fish) \ + --zsh <("$ARGC" --argc-completions zsh) + ''; + + disallowedReferences = lib.optional (!canExecuteHost) buildPackages.argc; + + passthru = { + tests = { + cross = + ( + if stdenv.hostPlatform.isDarwin then + if stdenv.hostPlatform.isAarch64 then pkgsCross.x86_64-darwin else pkgsCross.aarch64-darwin + else if stdenv.hostPlatform.isAarch64 then + pkgsCross.gnu64 + else + pkgsCross.aarch64-multiplatform + ).argc; + }; + }; + + meta = with lib; { + description = "Command-line options, arguments and sub-commands parser for bash"; + mainProgram = "argc"; + homepage = "https://github.com/sigoden/argc"; + changelog = "https://github.com/sigoden/argc/releases/tag/v${version}"; + license = with licenses; [ + mit + # or + asl20 + ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index b68123dd42b16..9a44f68ca64f2 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -6,7 +6,7 @@ }: let pname = "asm-lsp"; - version = "0.4.2"; + version = "0.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { owner = "bergercookie"; repo = "asm-lsp"; rev = "v${version}"; - hash = "sha256-EGgYOU6y23ULjnMGNjYhgF0JMPgvRuQ4UOWqwJxhBpU="; + hash = "sha256-vOkuTJFP2zme8S+u5j1TXt6BXnwtASRVH4Dre9g1dtk="; }; nativeBuildInputs = [ @@ -26,7 +26,12 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-x8Cj39Wki+pdoNIO8QPGK29KFJrHtDMoZJIXFEldno0="; + cargoHash = "sha256-lmOnBcLWfTCuQcPiRmPoFD/QvagfkApFP6/h1ot7atU="; + + # tests expect ~/.cache/asm-lsp to be writable + preCheck = '' + export HOME=$(mktemp -d) + ''; meta = { description = "Language server for NASM/GAS/GO Assembly"; diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index f1ce5135c2aeb..0a62c91c8e7e7 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -7,7 +7,7 @@ let pname = "beekeeper-studio"; - version = "4.1.13"; + version = "4.3.1"; plat = { aarch64-linux = "-arm64"; @@ -15,8 +15,8 @@ let }.${stdenv.hostPlatform.system}; hash = { - aarch64-linux = "sha256-8gcxYQ6ZvYC42V/vShFgalJtm8SGZRwtUfwUF9ZirBo="; - x86_64-linux = "sha256-Yfpm6//hhYVKX3YipzmFj3NgEsL2h3eW+9yC0yYiDgk="; + aarch64-linux = "sha256-7ZjyzWeu19zUX1u8t0hMu8F+1LN5/CtEotLNe/5rwPM="; + x86_64-linux = "sha256-vhKvOPPo/a9gwQ8FsC28dStQHI8SYzEbhdEW4elD7bU="; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index ae8b4c19d6df7..4b1647f37161e 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.8.49"; + version = "0.8.51"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-ZxFC8ZGcheYWmbqaZJYkqQkxn8F3RGjCsCNeQWnLKv0="; + hash = "sha256-7AwLedYPOZAKQpWWuEasI9ytN66MZYKFO9SgXi7NjIo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 784a21cbd82cf..2961632b88282 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-XKggNmyhY3ZwbmMvi78MPz36iulW1QPJRENW/LGgdts="; + sha256 = "sha256-/6x4NzlSJ2uswVlfFpevXaQxUxPnh3KvnbPIb8SFX9E="; }; projectFile = [ "Source/Boogie.sln" ]; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index a0c64e2c4f940..7e92ceaa43869 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.11"; + version = "0.37.12"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-a8iNMvMB52PEFVQq4Hv3bnIrA8k5p1a5M7JBp67SUDk="; + hash = "sha256-hnjhc4ZIabHml0HMuIanwXkx+QGnal7RlvZjcZUx8pQ="; }; - cargoHash = "sha256-UrVSGxDRhD3Tm25cUYOkkf/A2mgLZAyBImu1AeNOdX4="; + cargoHash = "sha256-5Z8ywbaWVgLx6PH/w9QV0LJpeqY7zpkCqnAb4BAww0o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index cc87e9b5a0d53..febeaa05b5d71 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-cDMdhfN7PxT687DG1djDNzZXb6E3OrWHXbl1XS6pxi4="; - aarch64-linux = "sha256-0wc7fuvyDcbx2HXVq5IMe59r3iNbnXe+gDjCXtU3KjQ="; - x86_64-darwin = "sha256-ZWsBfA1AsBFWA3f40coqhaAmnQc1U50VJ1RHWiybq+o="; - aarch64-darwin = "sha256-EaoEsBBlpewevk9HstJLZGgQGdPuPb5cqXYkcbGX9WU="; + x86_64-linux = "sha256-GAYwn2Epa5sT963e1Q7uOEBznSuE+5TV+Afr5ogCkSI="; + aarch64-linux = "sha256-EU++TsPV8kljhHv2e4NxhYThkLeSFK+xPqO0j+eM0Pw="; + x86_64-darwin = "sha256-/KlEyyC1jsQMQbO5xCO/6ONCTa/atwEnU71zUcroPIk="; + aarch64-darwin = "sha256-YQ5vNboYNT+uJa/8KiI812lGDfzuWJbA3ZzlzLpDqHY="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.27"; + version = "1.8.30"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index 1f8df689b79a9..bb1b7cf10f030 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-iaqqBeoack41D07Bbr0Fo1JXfF2ksXbqS5V5Ymt6Qvg="; + sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ]; diff --git a/pkgs/development/tools/darklua/default.nix b/pkgs/by-name/da/darklua/package.nix index adcce178dfef1..c9969fec4cc80 100644 --- a/pkgs/development/tools/darklua/default.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, darwin -, rustPlatform -, fetchFromGitHub +{ + lib, + stdenv, + darwin, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { @@ -18,10 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-XrWhOosQM+BaqViIju7urCi1B8+6kq8Taxe5T8LFzVE="; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix index 89e3b531e8eec..7f3c2c5a741f5 100644 --- a/pkgs/by-name/di/discover-overlay/package.nix +++ b/pkgs/by-name/di/discover-overlay/package.nix @@ -1,14 +1,14 @@ { lib, python3, fetchFromGitHub, gtk3, gobject-introspection, gtk-layer-shell, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { pname = "discover-overlay"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; src = fetchFromGitHub { owner = "trigg"; repo = "Discover"; rev = "refs/tags/v${version}"; - hash = "sha256-a9IPNy5i088rltQ9LYD+DgJ/1/wckQ2E5Bzg62t95yU="; + hash = "sha256-qA+gvgKQlTjcm0JPUmJp47Ttvm+69CW4lOngnueLVpo="; }; buildInputs = [ gtk3 gtk-layer-shell ]; diff --git a/pkgs/applications/misc/downonspot/Cargo.lock.patch b/pkgs/by-name/do/downonspot/Cargo.lock.patch index e224603a30708..e224603a30708 100644 --- a/pkgs/applications/misc/downonspot/Cargo.lock.patch +++ b/pkgs/by-name/do/downonspot/Cargo.lock.patch diff --git a/pkgs/applications/misc/downonspot/default.nix b/pkgs/by-name/do/downonspot/package.nix index 5a7c6ce6933b2..f6e568d964389 100644 --- a/pkgs/applications/misc/downonspot/default.nix +++ b/pkgs/by-name/do/downonspot/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "downonspot"; - version = "unstable-2023-11-26"; + version = "unstable-2024-04-30"; src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; - rev = "406fbf137306208bcb9835ad3aa92b0edbc01805"; - hash = "sha256-gY5pDZ5EwKhBmV8VyuKW/19BgfPSIZSp9rEI/GuonYQ="; + rev = "669dbb18e105129fff4886ba3710596d54a5f33a"; + hash = "sha256-sUptn+tmQoI2i9WBpJU23MkdQ9h+Lmx590+2+0XXC7w="; }; # Use official public librespot version cargoPatches = [ ./Cargo.lock.patch ]; - cargoHash = "sha256-CG9QY9Nfy/dxzvSPG2NB2/6yjTvdoDI76PRSaM138Wk="; + cargoHash = "sha256-GHhijwgTge7jzdkn0qynQIBNYeqtY26C5BaLpQ/UWgQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index ae59ceface077..0115b1baa114b 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -11,6 +11,7 @@ , hwdata , imagemagick_light , libXrandr +, libdrm , libglvnd , libpulseaudio , libselinux @@ -46,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.11.0"; + version = "2.11.3"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-/j0dRnApP5PQV4qVkqM6WlFdSZHlBTheaoWXSd2YP5k="; + hash = "sha256-kKtJvGnPncosmwjfTKa14G5jQiSkzkURBATvBmavdys="; }; outputs = [ "out" "man" ]; @@ -77,6 +78,7 @@ stdenv'.mkDerivation (finalAttrs: { ddcutil glib hwdata + libdrm libpulseaudio libselinux libsepol @@ -132,6 +134,9 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) (lib.cmakeBool "ENABLE_XRANDR" x11Support) + ] ++ lib.optionals stdenv.isLinux [ + (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") + (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; postInstall = '' diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 964805a549a54..350b62c224fb4 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.3.42"; + version = "8.4.0"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-Bc4C1cOOHdWkw2mHn3Q/2fcKuyCFDvOq1jLee2WPsyI="; + hash = "sha256-dj6WUatWJBQZwNc8uHJYTRTpbhAmJowJmfUzbB2qbnw="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index cab80e4e34586..adb9b6694024e 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.14"; + version = "2.13.27"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-fECf3s9XKJq/DOyypfMgFRJjEIMKMUeWgCJca88vqJw="; + hash = "sha256-UbABURsoQkTwYvQqR7Eg8ti56JQKnIcAm78Tmu+W+ls="; }; - vendorHash = "sha256-adPPXElmQgnFOSWZCoQ65MheYdT6lyqhIICA2Ci7+b4="; + vendorHash = "sha256-8xiIMl4eAFMvMsN5Y+ruw04BtdA+mrCnqxsoekyr4Bo="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index 98f5f4641262e..c8cba47510c7e 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "flarectl"; - version = "0.93.0"; + version = "0.94.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-XN/GRay5fJ2EjGHguG9i4ENCRBPZQcwQJg/2ka0HyaE="; + hash = "sha256-8lZJn4/IpkNT9IHK3rGvNE/Rv0CHQlVVu4F3K+J8fRA="; }; vendorHash = "sha256-/81Onrs+qyKEt79DtfX4EDDVxhzB0uqaHa3X+GbupWQ="; diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix index 0e5e155523d6b..e2dd4669a122b 100644 --- a/pkgs/by-name/go/godns/package.nix +++ b/pkgs/by-name/go/godns/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "godns"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-kdClyeU0hR0ymVLn9xe/kYVJE/9P/hAz/5UwRAQ2KCU="; + hash = "sha256-Kr+zMmjpHR2JtCaDyLMcQwOUXlPJeisu94zHRpEYV/I="; }; - vendorHash = "sha256-kSREFNIGH0MXiyKMp1LmrLkhKBhovvNRz46LTXT2XME="; + vendorHash = "sha256-E15h5p4ppRb91EUoz5dyWNFl745rt419NMCSurMLxis="; npmDeps = fetchNpmDeps { src = "${src}/web"; hash = "sha256-2yeqLly0guU/kpX+yH/QOoDGzyJTxkTaCt8EleJhybU="; diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 99d12c5e93229..72a0fa9474847 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.3.3", + "version": "1.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.3.3", + "version": "1.3.4", "hasInstallScript": true, "license": "None", "dependencies": { @@ -211,9 +211,9 @@ } }, "node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", + "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", "engines": { "node": ">=10.0.0" }, diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 67872584aadb7..df4f95b88bb50 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-zNHk80PGsjucoZgKbLn5khQmhgrxKJfldiLJBzF4EXs="; + hash = "sha256-Rc/dj3r3EpMbxx9rYj4kXnstmUGLR46U+7v6n1jSaiQ="; }; - npmDepsHash = "sha256-A/J7CUWtl0Wlv1fJKx1qSub7JhDoZhHsWHAYkcAGy6g="; + npmDepsHash = "sha256-w9d96SMLISPua9LMZscDjL7L8mGPO1RGyNjg8eU40hw="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 6844a5ae26ec9..9db23a478b5e2 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -1,63 +1,76 @@ -{ gtk3 -, gdk-pixbuf -, librsvg -, webp-pixbuf-loader -, gobject-introspection -, glib-networking -, glib -, shared-mime-info -, gsettings-desktop-schemas -, wrapGAppsHook3 -, gtk-layer-shell -, gnome -, libxkbcommon -, openssl -, pkg-config -, hicolor-icon-theme -, rustPlatform -, lib -, fetchFromGitHub +{ + gtk3, + gdk-pixbuf, + librsvg, + webp-pixbuf-loader, + gobject-introspection, + glib-networking, + glib, + shared-mime-info, + gsettings-desktop-schemas, + wrapGAppsHook3, + gtk-layer-shell, + gnome, + libxkbcommon, + openssl, + pkg-config, + hicolor-icon-theme, + rustPlatform, + lib, + fetchFromGitHub, + luajit, + luajitPackages, + libpulseaudio, + features ? [ ], }: +let + hasFeature = f: features == [ ] || builtins.elem f features; +in rustPlatform.buildRustPackage rec { pname = "ironbar"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "ironbar"; rev = "v${version}"; - hash = "sha256-y4w4i/IVe1+wjB2tsCPQH6c7XTl93u45Q0pXFi3TY1E="; + hash = "sha256-SowZ3qo06x32+A02Wmq4N/rU/yxyKqkn407qHzJLU0M="; }; - cargoHash = "sha256-h5yNJM+NvX/Hi86iSegHWevPcPZeDmJ4y/qNr3G20Qg="; + cargoHash = "sha256-DaF669mOnICTnUzH4mc640xIecin/UEZSk7PWDjQbr0="; - buildInputs = [ - gtk3 - gdk-pixbuf - glib - gtk-layer-shell - glib-networking - shared-mime-info - gnome.adwaita-icon-theme - hicolor-icon-theme - gsettings-desktop-schemas - libxkbcommon - openssl - ]; + buildInputs = + [ + gtk3 + gdk-pixbuf + glib + gtk-layer-shell + glib-networking + shared-mime-info + gnome.adwaita-icon-theme + hicolor-icon-theme + gsettings-desktop-schemas + libxkbcommon + ] + ++ lib.optionals (hasFeature "http") [ openssl ] + ++ lib.optionals (hasFeature "volume") [ libpulseaudio ] + ++ lib.optionals (hasFeature "cairo") [ luajit ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 gobject-introspection ]; + propagatedBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - gtk3 - ]; + runtimeDeps = [ luajitPackages.lgi ]; - preFixup = '' - gappsWrapperArgs+=( + buildNoDefaultFeatures = features != [ ]; + buildFeatures = features; + + gappsWrapperArgs = + '' # Thumbnailers --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" @@ -66,6 +79,15 @@ rustPlatform.buildRustPackage rec { # gtk-launch --suffix PATH : "${lib.makeBinPath [ gtk3 ]}" + '' + + lib.optionalString (hasFeature "cairo") '' + --prefix LUA_PATH : "./?.lua;${luajitPackages.lgi}/share/lua/5.1/?.lua;${luajitPackages.lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua" + --prefix LUA_CPATH : "./?.so;${luajitPackages.lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so" + ''; + + preFixup = '' + gappsWrapperArgs+=( + ${gappsWrapperArgs} ) ''; @@ -74,7 +96,11 @@ rustPlatform.buildRustPackage rec { description = "Customizable gtk-layer-shell wlroots/sway bar written in Rust"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ yavko donovanglover jakestanger ]; + maintainers = with maintainers; [ + yavko + donovanglover + jakestanger + ]; mainProgram = "ironbar"; }; } diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix index 1001ed711ad8e..9b51b96ac2dc0 100644 --- a/pkgs/by-name/ji/jikken/package.nix +++ b/pkgs/by-name/ji/jikken/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "jikken"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jikkenio"; repo = "jikken"; rev = "v${version}"; - hash = "sha256-A6+sezhob7GqAzuJsJGH7ZDLTJhCD+f0t3zx/IMdPsI="; + hash = "sha256-bV9NjwTcX1euk8zRJMGkAULegQmiT8z4jxngOwOPr+M="; }; - cargoHash = "sha256-FxsI2ku52MlSGUph3/ovmn6HIwW+cUwVXuwzcd/1DV4="; + cargoHash = "sha256-gJg/l7L19qk6DELqo4fYc2ZWTHqKeUFEF3YU3+uyFjQ="; nativeBuildInputs = [ pkg-config ]; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index 0853481fe1ed9..827716689ec48 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-qn5EjddLVRhN90SICa39A28giXQ24Ol1nfbxNH5TXhc="; + hash = "sha256-+w7cn2lrNlgMvmmIJgx6wukJcSyeHLEzpM3uH20cYJ8="; }; - vendorHash = "sha256-R9qaG19Vp+1a7AL0q8Cl1jN89cbXzLwbnN163WMWAEw="; + vendorHash = "sha256-BDpNt/0d/QkJlkyWkw96xVos8kml1BwvStM8NqB4WC8="; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 2c31119e2bfa6..af87959a2e5f8 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "libmamba"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "${pname}-${version}"; - hash = "sha256-HfmvLi9IBWlaGAn2Ej4Bnm4b3l19jEXwNl5IUkdVxi0="; + hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; }; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index cb63a81700545..b66e3ba6c5375 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.2.1", - "hash": "sha256-pyvHhFfwgozaTP3AhqWPKOuXdC23stXiUW2PpdYRR7M=" + "version": "5.2.2", + "hash": "sha256-Tp8adn9cNtHmEdoA418b/KMsqluZWKO60u6kCtAmpbo=" }, "beta": { - "version": "5.2.1", - "hash": "sha256-pyvHhFfwgozaTP3AhqWPKOuXdC23stXiUW2PpdYRR7M=" + "version": "5.2.2", + "hash": "sha256-Tp8adn9cNtHmEdoA418b/KMsqluZWKO60u6kCtAmpbo=" } } diff --git a/pkgs/by-name/mo/monaspace/package.nix b/pkgs/by-name/mo/monaspace/package.nix index a27be47afa664..b19532c8fb187 100644 --- a/pkgs/by-name/mo/monaspace/package.nix +++ b/pkgs/by-name/mo/monaspace/package.nix @@ -5,12 +5,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "monaspace"; - version = "1.000"; + version = "1.100"; src = fetchzip { url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip"; stripRoot = false; - hash = "sha256-H8NOS+pVkrY9DofuJhPR2OlzkF4fMdmP2zfDBfrk83A="; + hash = "sha256-PNeWDWYSd/oAviwyvwiQSLeATGqGIFYZWjKp+trT5x4="; }; outputs = [ "out" "woff" ]; diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock index 9151a00466595..bf8ad6ce4d743 100644 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -922,9 +922,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "mycelium" -version = "0.5.1" +version = "0.5.2" dependencies = [ "aes-gcm", "blake3", @@ -1075,7 +1075,7 @@ dependencies = [ [[package]] name = "myceliumd" -version = "0.5.1" +version = "0.5.2" dependencies = [ "axum", "base64 0.22.0", @@ -1463,17 +1463,10 @@ dependencies = [ "memchr", "parking_lot", "procfs", - "protobuf", "thiserror", ] [[package]] -name = "protobuf" -version = "2.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - -[[package]] name = "quinn" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1626,9 +1619,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.0", "bytes", @@ -1756,9 +1749,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "ring 0.17.7", "rustls-webpki", @@ -1817,18 +1810,18 @@ checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", @@ -1837,9 +1830,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index a180a77278773..eea61e0c326b6 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-x3XqFKcOLwKhgF/DKo8Qp3QLyaE2hdCTjfLSE8K3ifQ="; + hash = "sha256-Mz4YYpnuSGUwQANiXzsJNAYMugXL229E30wnZCu2lSM="; }; cargoLock = { diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 4206f21c26049..ee07a8fef3be1 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.1.55"; + version = "1.2.0"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-aIqIcNXlzpvW90WJs9tJajXvnEQB0IiNCu8B62cwElo="; + hash = "sha256-SxUZvPSitzWZzTa490dkJWw6fZ5PtN8hy7fglifPn6o="; }; - npmDepsHash = "sha256-QIGqx1Peogmdo1KLHkzUKqvAuA6jCJRfxeQ1X7p6vTM="; + npmDepsHash = "sha256-fwjtEw2mAnNX7lo9ovCC58qqtJPDLc2Ho9I1Ui0k/iI="; dontNpmInstall = true; diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/by-name/ne/neovide/package.nix index ce9b091add820..ce9b091add820 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/by-name/ne/neovide/package.nix diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/by-name/ne/neovide/skia-externals.json index e57814e2a2d87..e57814e2a2d87 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/by-name/ne/neovide/skia-externals.json diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 0dd8ca8a0877b..0dd8ca8a0877b 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix diff --git a/pkgs/applications/editors/neovim/system_rplugin_manifest.patch b/pkgs/by-name/ne/neovim-unwrapped/system_rplugin_manifest.patch index f634d3ec056a2..f634d3ec056a2 100644 --- a/pkgs/applications/editors/neovim/system_rplugin_manifest.patch +++ b/pkgs/by-name/ne/neovim-unwrapped/system_rplugin_manifest.patch diff --git a/pkgs/applications/editors/neovim/treesitter-parsers.nix b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix index d36f8bda85429..d36f8bda85429 100644 --- a/pkgs/applications/editors/neovim/treesitter-parsers.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix diff --git a/pkgs/applications/editors/neovim/update-treesitter-parsers.py b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py index 27260ca649172..27260ca649172 100755 --- a/pkgs/applications/editors/neovim/update-treesitter-parsers.py +++ b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 16c1f2d847ff4..01dd71d3ca21f 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.4.4"; + version = "0.4.5"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-RO0+Zz1sivIjD8OM4TBHR5geJw540MAJfXEl2yriH6o="; + hash = "sha256-mR+jazZ2Xnf5xuWbVrFCfGOR+sjEUWL3WqHJynIHVFQ="; }; - cargoHash = "sha256-GJLrUF2YAMtCtXTPJvlUURfiTYBFUE6Gmeux+5RXqAM="; + cargoHash = "sha256-+FTbvS4wqBjEL+uWYKhHQp0uMmrvVPYwxdQeZ4cWrhw="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index eed3077f5ef33..3b6c65c8fc56e 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "novops"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "PierreBeucher"; repo = pname; rev = "v${version}"; - hash = "sha256-LrEPdEVWgbZ6WyEqdfAhUjKXPuk8Xx7kmLA2ZsPFf1U="; + hash = "sha256-9uX+YwCCIrf0BDioDL+G2z2ZNwYRFyPZa/mzTYXv51Y="; }; - cargoHash = "sha256-kI836Z0fgpmPPoX0HtWkZG731xaVWgWkXF0eCaQfM28="; + cargoHash = "sha256-ib1iifqQezWqXxQKppm0ghz0qi5z0siZUMVPHufiC0k="; buildInputs = [ openssl # required for openssl-sys diff --git a/pkgs/by-name/po/popcorntime/package.nix b/pkgs/by-name/po/popcorntime/package.nix index 7cf0d3c3c3078..28fd5b60e6898 100644 --- a/pkgs/by-name/po/popcorntime/package.nix +++ b/pkgs/by-name/po/popcorntime/package.nix @@ -4,6 +4,7 @@ , gsettings-desktop-schemas , gtk3 , lib +, libGL , makeDesktopItem , makeWrapper , nwjs @@ -16,11 +17,11 @@ stdenv.mkDerivation rec { pname = "popcorntime"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/popcorn-official/popcorn-desktop/releases/download/v${version}/Popcorn-Time-${version}-linux64.zip"; - hash = "sha256-A5G66KkCQ1AiOOO02dZFAVz6dqvComrd5lXQ4Wc1S0s="; + hash = "sha256-lCsIioR252GWP/+wNwkTw5PLSal/M9x6mlR/EKOd/hs="; }; nativeBuildInputs = [ @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { dontUnpack = true; makeWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev libGL ]}" "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" ]; diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix index 8e9c6ceec3ad6..f6859c50f14ec 100644 --- a/pkgs/by-name/pr/promptfoo/package.nix +++ b/pkgs/by-name/pr/promptfoo/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "promptfoo"; - version = "0.54.1"; + version = "0.55.0"; src = fetchFromGitHub { owner = "promptfoo"; repo = "promptfoo"; rev = "${version}"; - hash = "sha256-ZDr2sJRiy26a+NPAcsqTTAuccQQmvmDdMtrr1FGzaSk="; + hash = "sha256-XQnsOr+L2MCKPzZeIKzx4XjWF6B18gBVDU0j31CgjUc="; }; - npmDepsHash = "sha256-ZPwEkhINT0sQc4BNUVbJzI1ffJZzXJa7Ld+0am6MYtM="; + npmDepsHash = "sha256-f7tlRZHjdeIk17hQhzmIbhMwUkoca3J+F65cr0dvSmU="; dontNpmBuild = true; diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix new file mode 100644 index 0000000000000..94d6f2f65e9aa --- /dev/null +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + desktop-file-utils, + wrapGAppsHook4, + meson, + ninja, + pkg-config, + vala, + glib, + glib-networking, + gtk4, + json-glib, + libadwaita, + libarchive, + libgee, + libsoup_3, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "protonplus"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = "Vysp3r"; + repo = "protonplus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rYGUKOVQHYaUzQZaVas5zy26xv2NchcqZ7YvTmejb20="; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + glib-networking + gtk4 + json-glib + libadwaita + libarchive + libgee + libsoup_3 + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + mainProgram = "com.vysp3r.ProtonPlus"; + description = "A simple Wine and Proton-based compatibility tools manager"; + homepage = "https://github.com/Vysp3r/ProtonPlus"; + changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ getchoo ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 01dc71bf2fefb..a8c5fb546e79e 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -17,8 +17,10 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "azure-identity" "azure-keyvault-keys" "azure-mgmt-compute" + "azure-mgmt-containerservice" "azure-mgmt-network" "azure-mgmt-security" "azure-storage-blob" diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 309f680751f76..6902d0d1f04cc 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -1,8 +1,12 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.2.15"; + version = "2.2.16"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +15,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = version; - hash = "sha256-ju/Xa3s0engE09q9EtKK/zhgimMmlTPXJrpwWQqUFLs="; + hash = "sha256-zT+ixOM+by13iM78CHkQqTS9LCLFspHNyEjd7P2psUE="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; @@ -58,7 +62,10 @@ python3Packages.buildPythonApplication rec { description = "An hyperland plugin system"; homepage = "https://github.com/hyprland-community/pyprland"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ iliayar johnrtitor ]; + maintainers = with lib.maintainers; [ + iliayar + johnrtitor + ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 3a0528e6693e3..6d73673b26e60 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.9.5"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-3vcuf49gutlXbFT5mUuZw9fDjyvb0Q+lXyn4n+RcLdU="; + hash = "sha256-hJNlz2DpA30fKpZu2O0I31oDSAfdW/s/xXzwOdRX9kw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/by-name/ra/radicale/package.nix index c9523233379e2..d3637df36b07b 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.9"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-i4NQ1+ltRE0g8AoyGKKVcgZgSmLeppnobu6bf2+XmWY="; + hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ="; }; postPatch = '' @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { defusedxml passlib vobject + pika python-dateutil pytz # https://github.com/Kozea/Radicale/issues/816 ] ++ passlib.optional-dependencies.bcrypt; diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index e98c41815e750..f4a3310a70786 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -4,14 +4,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.7.26"; + version = "1.8.8"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; rev = "v${version}"; - hash = "sha256-u+xnrqJXtjElVXlwkCTHztcRl998CwoTEIvaGYzGOLU="; + hash = "sha256-XhAeOeMNUE5MMayWlERhTMmkEnA0EpcB6ln1txGTTDE="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/re/redka/package.nix b/pkgs/by-name/re/redka/package.nix new file mode 100644 index 0000000000000..ebe81491f86bb --- /dev/null +++ b/pkgs/by-name/re/redka/package.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "redka"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "nalgeon"; + repo = "redka"; + rev = "v${version}"; + hash = "sha256-nE5JrKsvQeU/wDNl5HYFiK9ezyGpUqX4d4SaZhfURxo="; + }; + + vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro="; + + subPackages = [ "cmd/redka" "cmd/cli" ]; + + ldflags = [ "-X main.version=v${version}" ]; + + postInstall = '' + mv $out/bin/{cli,redka-cli} + ''; + + meta = { + description = "Redis re-implemented with SQLite"; + homepage = "https://github.com/nalgeon/redka"; + maintainers = with lib.maintainers; [ sikmir ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index dd971a8df0feb..21f7596d0169e 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.0+20240426git72f3c383b"; + version = "1.15.0+20240502gita79411a5d"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-BOQT5nG6Vu12RyAkCwnh6PYfNQTcYGdV4XHDpi/8kPE="; + hash = "sha256-JgmoVTFq5z/4YFnmqn/nct7M50JOevQHWfMsaVtBybo="; }; passthru.updateScript = diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index ef900d6d476a4..68c5d35cd0fa0 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-P7A788hlyfb3bQsltMvGlbMn67643h6/ijEQP0yjIaU="; + hash = "sha256-bBBXW/06lfhiS44JF9i/x4clfnvh2nitOyAgOPoHI0A="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index 4892914e2fae4..e3896021e0de8 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simde"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; rev = "v${version}"; - hash = "sha256-hQtSxO8Uld6LT6V1ZhR6tbshTK1QTGgyQ99o3jOIbQk="; + hash = "sha256-igjDHCpKXy6EbA9Mf6peL4OTVRPYTV0Y2jbgYQuWMT4="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index ad15cd9cb1ee6..d4a82a1982a57 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "5.5.5"; + version = "5.7.0"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-MD1AbpHlpaMaPlpJmGp0oPbOYPmJEhhIXmexkpCr1wY="; + hash = "sha256-T8ojnay/FCa9Q4PObqlfy2MC4pKTF73taNW8elNDjIg="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index e884a5177fa6b..13d1b8aceedbc 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.36.5"; + version = "2.36.10"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-amalb1NNoA9KqeQtMtJZamLFNL3Wc/21ZVkr/Evhmik="; + hash = "sha256-lwbd5sXqzC3H2GwmVqxAdt6Qcic00wh39l5Kp1UIYAs="; }; vendorHash = "sha256-UPrLXzAdvCOmLm1tekzKyulQ4+2BSyPUF1k66GwKS88="; diff --git a/pkgs/by-name/sw/swww/Cargo.lock b/pkgs/by-name/sw/swww/Cargo.lock index d9c0ee3e72a81..bc481ee36a3be 100644 --- a/pkgs/by-name/sw/swww/Cargo.lock +++ b/pkgs/by-name/sw/swww/Cargo.lock @@ -31,47 +31,48 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -229,6 +230,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] name = "cast" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -236,12 +243,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -345,9 +353,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "crc32fast" @@ -521,9 +529,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -571,9 +579,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -612,11 +620,11 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "byteorder", + "byteorder-lite", "thiserror", ] @@ -659,6 +667,12 @@ dependencies = [ ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -684,9 +698,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -724,9 +738,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libfuzzer-sys" @@ -763,9 +777,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1020,9 +1034,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1219,9 +1233,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -1265,18 +1279,18 @@ checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -1361,7 +1375,7 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "swww" -version = "0.9.4" +version = "0.9.5" dependencies = [ "assert_cmd", "clap", @@ -1374,7 +1388,7 @@ dependencies = [ [[package]] name = "swww-daemon" -version = "0.9.4" +version = "0.9.5" dependencies = [ "bitcode", "keyframe", @@ -1394,9 +1408,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.59" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -1449,18 +1463,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -1544,9 +1558,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", @@ -1569,7 +1583,7 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.9.4" +version = "0.9.5" dependencies = [ "bitcode", "criterion", @@ -1764,37 +1778,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1935,9 +1927,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix index 4dc92570f93d3..de6889f5b1f20 100644 --- a/pkgs/by-name/sw/swww/package.nix +++ b/pkgs/by-name/sw/swww/package.nix @@ -1,22 +1,23 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, lz4 -, libxkbcommon -, installShellFiles -, scdoc +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + lz4, + libxkbcommon, + installShellFiles, + scdoc, }: rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "LGFae"; repo = "swww"; rev = "refs/tags/v${version}"; - hash = "sha256-LvSPKg8cWlwKu4a+P/G0dOqV+aPsUq3axI1QqnLj4U8="; + hash = "sha256-ldy9HhIsWdtTdvtRLV3qDT80oX646BI4Q+YX5wJXbsc="; }; cargoLock = { @@ -52,12 +53,15 @@ rustPlatform.buildRustPackage rec { --zsh completions/_swww ''; - meta = with lib; { + meta = { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/LGFae/swww"; - license = licenses.gpl3; - maintainers = with maintainers; [ mateodd25 donovanglover ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + mateodd25 + donovanglover + ]; + platforms = lib.platforms.linux; mainProgram = "swww"; }; } diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index a381efeaa8715..36ed4f13f8cc6 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.57.5"; + version = "0.58.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G2eIzEgTKWCS8GGR8I1jZPQVBd8HwC/iB632ErsksGo="; + hash = "sha256-Bcn3wwhAzbdO3XBrLKApAurpnpRcVJLWo6C9x/n3Nz0="; }; - vendorHash = "sha256-JKiEJw61B4vyKsi4M36v8NF/eOqbGr55/8y/Rru3L9Q="; + vendorHash = "sha256-ZuOgbwE32yFXPn+AqlQ397a4UZ+MWuj5ppCrDGnC3og="; doCheck = false; diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index b799a753146f7..9b236aabc6d94 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tootik"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; rev = version; - hash = "sha256-afGFQxC9WJxSQk6LLl4IBo1JoKqcKQ/Qc7HOaJKi2Do="; + hash = "sha256-7rdDVxfTYcj6Wcoxrb5xCbpEYVTHQpocM27mSezkpoE="; }; vendorHash = "sha256-Lsc8nK4I1gZEW7RbEapHr3IJ6wTATLElX3XfNX1LwvM="; diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 9de7fca6b0bfc..0c69a0cf1a4ce 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -4,6 +4,8 @@ }: rustPlatform.buildRustPackage rec { pname = "typos-lsp"; + # Please update the corresponding VSCode extension too. + # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix version = "0.1.18"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index 8ce458d3e4a36..e5d8094e39140 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.320"; + version = "1.330"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-9crFUfj1mOXg4gD607jL2eHq8wlq/yEi5sgzKJ5YavM="; + hash = "sha256-CscUUcyLsk/S70tT2uGRqLiF8fa4KxC9pVrOziWJ/fI="; }; installPhase = '' diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index ca151c3b4dfbb..9bf3cbdf4cf37 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-04"; + version = "2024-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-tpiggDnhYPeLJ21mctXjbNSS2Gw4RI8gnpc1stDVmMc="; + hash = "sha256-MFhBCnYOJOVQl+xJ4wxi10nyb5MfRHnNVlba9LV1nsY="; }; dontUnpack = true; diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index 61ddd00abd308..13c3de8561534 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240418/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20231026"; + version = "20240418"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-sKQOq0GMslkzND2ayL5M6XIxJv8t0yj6XCP3poA6wRc="; + hash = "sha256-o6WjXPE4uuCDYNqzj0rkOC/RLmZVenEuaSiu8PS4kx4="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240418/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 41db4063e9f60..daf912e2a7c1f 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "46.0"; + version = "46.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-r/avaTksBJVr+tl23sXRWDtB1aM06TeZX3w8oHQN4iE="; + hash = "sha256-lLtSU2WwYKKML2AX0iy/KvURVQclSqQum/wAC7wYq2I="; }; depsBuildBuild = [ @@ -110,8 +110,6 @@ stdenv.mkDerivation rec { "-Dmultimedia=disabled" ]; - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index c74dd74571dfd..43adcd092ffb1 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "46.0"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-EYkwAru1QIKJZoNwe8OZGuVaLzBAgRp2DjqSyWVE+G4="; + hash = "sha256-tu63iRAN6UtQ6+Lnfxaya+TC2xVImQXxmNBgxCXhkHY="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 85067754f2903..7b3306df57193 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -6,7 +6,6 @@ , pkg-config , python3 , libxml2 -, gnome , gitUpdater , nautilus , glib @@ -30,14 +29,14 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.52.0"; + version = "3.52.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = version; - hash = "sha256-6+6/fgGlSM/57+n0SopuF0ZY9htma5usIgxy2BBAC+M="; + hash = "sha256-npoQfe5+HTn7CsrW6MuOoiYBc3rYMAMv4apC6dFR8O4="; }; nativeBuildInputs = [ @@ -69,13 +68,7 @@ stdenv.mkDerivation rec { nautilus # For extension ]; - # Silly build system, it looks for dbus file from gnome-shell in the - # installation tree of the package it is configuring. postPatch = '' - substituteInPlace src/meson.build \ - --replace "gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml'" \ - "'${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml'" - patchShebangs \ data/icons/meson_updateiconcache.py \ data/meson_desktopfile.py \ diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index ba97b24f6c0ad..a5254d1bbcf66 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -23,12 +23,12 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "46.0"; + version = "46.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-Fnh4Y0H2ZKxFgHhCIqFkCfqb9cx6XxtG3O/SqhPdujE="; + hash = "sha256-LxkqcIX71oQ+z4JXFtnaIeyScgKRSeo18+FZ4Kwwm4A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix index c71f2dd48e21c..4c5af8d26b454 100644 --- a/pkgs/development/compilers/cakelisp/default.nix +++ b/pkgs/development/compilers/cakelisp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { pname = "cakelisp"; # using unstable as it's the only version that builds against gcc-13 - version = "0.3.0-unstable-2024-04-18"; + version = "0.3.0-unstable-2024-04-25"; src = fetchgit { url = "https://macoy.me/code/macoy/cakelisp"; - rev = "115ab436056602b7f3a1ca30be40edbfcc88299d"; - hash = "sha256-rgBtT24aopXLTeDffjXGvJ3RgT+QLlr50Ju9a6ccyzc="; + rev = "eb4427f555c3def9d65612672ccfe59e11b14059"; + hash = "sha256-wFyqAbHrBMFKqMYlBjS6flYHPn3Rxtaiqb1rRmlZrB4="; }; buildInputs = [ gcc ]; diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix index 49af7e6676e33..ccbf8ef5da344 100644 --- a/pkgs/development/compilers/inform6/default.nix +++ b/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.41-r11"; + version = "6.42-r1"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-kfFfjJL03f3af1h/JdvkItuDFu8aGlM3BRa2eBB+ddY="; + sha256 = "sha256-JZaMhA4M+fDgk52tWCJokG9J/a1+FQHL7+VxAT4PgQo="; }; buildInputs = [ perl ]; diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index ea5323db9b0f3..3c0e551791e54 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -25,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "18.1.4"; sha256 = "sha256-LyQEb4ZJXm2hkPOM9XITIploMT2VKIQWxUFio7SXrc0="; } +, officialRelease ? { version = "18.1.5"; sha256 = "0n44chqn96xsa00ryhwk8g0vv3zx908xjakkgjsa14sjr9mcsq8q"; } # i.e.: # { # version = /* i.e. "15.0.0" */; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 1b5f21ddef796..089043dc6deea 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -76,12 +76,12 @@ in { nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.0.2"; + version = "2.0.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZPUdO/Vt6dDueeLKapzpRFSvmmOhQaaWnOjFmmC4LM8="; + hash = "sha256-cVJr0HQ53I43j6Gm60B+2hKY8fPU30R23KDjyjy+Pwk="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ] @@ -161,10 +161,10 @@ in { }); nim-unwrapped-1 = nim-unwrapped-2.overrideAttrs (finalAttrs: prevAttrs: { - version = "1.6.18"; + version = "1.6.20"; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-UCQaxyIpG6ljdT8EWqo1h7c8GqKK4pxXPBWluKYCoss="; + hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k="; }; patches = [ diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index 3613ed55e0844..1f714f1b2dead 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-VbJptTUi12pJh1wz4I+xL6HVo/rSiUHCkvgEMPe1F6o="; + sha256 = "sha256-g8Z5MRM3KIgCjGxtU9JLEsFUjFxPKmc6OwY17C59cxg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 51bf82aafbbe8..d27efe1f2b828 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -1,40 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, readline }: +{ lib, stdenv, fetchFromGitLab, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "picoc"; - version = "2015-05-04"; + version = "2.1-unstable-2018-06-05"; - src = fetchFromGitHub { - sha256 = "01w3jwl0vn9fsmh7p20ad4nl9ljzgfn576yvncd9pk9frx3pd8y4"; - rev = "4555e8456f020554bcac50751fbb9b36c7d8c13b"; - repo = "picoc"; + src = fetchFromGitLab { owner = "zsaleeba"; + repo = "picoc"; + rev = "dc85a51e9211cfb644f0a85ea9546e15dc1141c3"; + hash = "sha256-yWPRbJLT09E7pqqs9E2k48ECoRR2nhcgTgK5pumkrxo="; }; buildInputs = [ readline ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - postPatch = '' - substituteInPlace Makefile --replace '`svnversion -n`' "${version}" - ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=implicit-function-declaration" + ]); enableParallelBuilding = true; # Tests are currently broken on i686 see # https://hydra.nixos.org/build/24003763/nixlog/1 - doCheck = if stdenv.isi686 then false else true; + doCheck = !stdenv.isi686 && !stdenv.isAarch64; checkTarget = "test"; installPhase = '' + runHook preInstall + install -Dm755 picoc $out/bin/picoc mkdir -p $out/include install -m644 *.h $out/include + + runHook postInstall ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Very small C interpreter for scripting"; mainProgram = "picoc"; longDescription = '' @@ -47,7 +50,7 @@ stdenv.mkDerivation rec { very sparing of data space. This means it can work well in small embedded devices. ''; - homepage = "https://github.com/zsaleeba/picoc"; + homepage = "https://gitlab.com/zsaleeba/picoc"; downloadPage = "https://code.google.com/p/picoc/downloads/list"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 42f1f8db59bb0..c1dba7c34bda3 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, autoreconfHook -, mp4v2Support ? true, mp4v2 ? null +, mp4v2Support ? true, mp4v2 , drmSupport ? false # Digital Radio Mondiale }: -assert mp4v2Support -> (mp4v2 != null); - stdenv.mkDerivation rec { pname = "faac"; version = "1.30"; @@ -14,21 +12,20 @@ stdenv.mkDerivation rec { sha256 = "1lmj0dib3mjp84jhxc5ddvydkzzhb0gfrdh3ikcidjlcb378ghxd"; }; - configureFlags = [ ] - ++ lib.optional mp4v2Support "--with-external-mp4v2" + configureFlags = lib.optional mp4v2Support "--with-external-mp4v2" ++ lib.optional drmSupport "--enable-drm"; hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ] - ++ lib.optional mp4v2Support mp4v2; + buildInputs = lib.optional mp4v2Support mp4v2; enableParallelBuilding = true; meta = with lib; { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; + homepage = "https://github.com/knik0/faac"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index c2a8e16e1d48a..45a4a2b93acf3 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libirecovery"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "dev" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-84xwSOLwPU2Py6X2r6FYESxdc1EuuD6xHEXTUUEdvTE="; + hash = "sha256-3C66oNjIZA6Byf1Y2cVQUSLz6Css1y4xFZuQmo7QxMo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 3716090a30d7f..6859caff61aa9 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,19 +8,15 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - hash = "sha256-fC03LwZIUkEsAs9TN0n2z0iSOGPAtVCeuW5rxC7Ek7Q="; + hash = "sha256-bJ0NMbK9c21YYdcg/TW3ePSDVi5hly6lSW7wXFskI8M="; }; - nativeBuildInputs = [ - python3.pkgs.pytest - ]; - buildInputs = [ minizip zlib @@ -36,6 +32,10 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ + python3.pkgs.pytest + ]; + checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index e0e1421c476e0..508d3ae168ae8 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kYhfufffM4r+ZVgcjnulqFlf1756pirlPysGZnUBzt8="; + sha256 = "sha256-h+JlrIYc3i9RjbmiGLgWVvkP4LyQkTrnUxkCU7SR35k="; }; doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 47a6249ebdc62..5b08cfa7dcf07 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -3,6 +3,7 @@ , fetchzip , lib , libcxx +, llvmPackages , addOpenGLRunpath , patchelf @@ -17,11 +18,11 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "2.0.0"; + version = "2.3.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.hostPlatform.system == "x86_64-darwin" then libcxx else stdenv.cc.cc.lib; + libcxx-for-libtorch = if stdenv.isDarwin then libcxx else stdenv.cc.cc.lib; in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -71,6 +72,9 @@ in stdenv.mkDerivation { otool -L $f done for f in $out/lib/*.dylib; do + if otool -L $f | grep "@rpath/libomp.dylib" >& /dev/null; then + install_name_tool -change "@rpath/libomp.dylib" ${llvmPackages.openmp}/lib/libomp.dylib $f + fi install_name_tool -id $out/lib/$(basename $f) $f || true for rpath in $(otool -L $f | grep rpath | awk '{print $1}');do install_name_tool -change $rpath $out/lib/$(basename $rpath) $f @@ -99,6 +103,9 @@ in stdenv.mkDerivation { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; maintainers = with maintainers; [ junjihashimoto ]; - platforms = platforms.unix; + platforms = [ + "aarch64-darwin" + "x86_64-linux" + ]; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 83533d89b1e8b..dd8104ad5f0df 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,19 +1,19 @@ -version : builtins.getAttr version { - "2.0.0" = { - x86_64-darwin-cpu = { - name = "libtorch-macos-2.0.0.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-2.0.0.zip"; - hash = "sha256-u6y5IeYoiOC0yQ/k6JCChDs9lXWccLxUorgR8L62lkM="; +version: builtins.getAttr version { + "2.3.0" = { + aarch64-darwin-cpu = { + name = "libtorch-macos-arm64-2.3.0.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.3.0.zip"; + hash = "sha256-l4qY1jbsECN5qm7dWJ2jSvKuQwQ/HI6G6Vq1Kh2rxkM="; }; x86_64-linux-cpu = { - name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cpu.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcpu.zip"; - hash = "sha256-BoZQ2MC1CDVVGfX3SHC3mEpLGWO8XK7AcLcHJXDsXuc="; + name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcpu.zip"; + hash = "sha256-dKAk6UusK2eQIcP0oMXh9cnufMpy5Ph4SGPkIPPV6ds="; }; x86_64-linux-cuda = { - name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cu118.zip"; - url = "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcu118.zip"; - hash = "sha256-Dpw9kQdA1NI9EOT7JBKwQP4wZT6lizcnKKTQ8WVJCZc="; + name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cu121.zip"; + url = "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcu121.zip"; + hash = "sha256-6B+NF6q78I2WKFudn8bK+eNYDi1zQ7mdgv06fZbm2rE="; }; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh index 5c6d60ae8b208..2682fe6779768 100755 --- a/pkgs/development/libraries/science/math/libtorch/prefetch.sh +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -6,10 +6,11 @@ set -eou pipefail version=$1 bucket="https://download.pytorch.org/libtorch" -CUDA_VERSION=cu116 +CUDA_VERSION=cu121 url_and_key_list=( - "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip" + "aarch64-darwin-cpu $bucket/cpu/libtorch-macos-arm64-${version}.zip libtorch-macos-arm64-${version}.zip" + "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-x86_64-${version}.zip libtorch-macos-x86_64-${version}.zip" "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip" "x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip" ) diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index a6bc5a086251c..485c5322cacd9 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.9"; + version = "0.108.10"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; rev = "releases/${version}"; - hash = "sha256-ueIa9CL4K5ygKpkMRvfuWR0emEG6omg65ZKCsConWsw="; + hash = "sha256-rHNGnnDFU9UrszjjkZQkgWCfjjBIQba6vVbK/HLpRsQ="; }; buildInputs = diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 3473b96f494c8..d160f74332185 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -31,14 +31,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.76.0"; + version = "0.76.1"; outputs = [ "out" "dev" ] ++ lib.optional (gtkVersion != null) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-u84wuPUENwsS1kOcB6gpk+l9fpr+LdNngXzVj/Ap/9o="; + hash = "sha256-CE6D73ZXdCaaSynfl8oi7cNDuaHYFDPTALjLLQh6HsI="; }; patches = [ @@ -101,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs perf/* - patchShebangs src/box_drawing_generate.sh patchShebangs src/parser-seq.py patchShebangs src/modes.py ''; diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix index 4d19fd7589971..8891aba7cd9d5 100644 --- a/pkgs/development/php-packages/amqp/default.nix +++ b/pkgs/development/php-packages/amqp/default.nix @@ -1,8 +1,14 @@ -{ buildPecl, lib, rabbitmq-c, fetchFromGitHub }: +{ + buildPecl, + lib, + rabbitmq-c, + fetchFromGitHub, +}: let version = "2.1.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "amqp"; diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 9aec7d6607630..f8b8ff1d83b7e 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -1,8 +1,16 @@ -{ buildPecl, lib, pcre2, fetchFromGitHub, php, fetchpatch }: +{ + buildPecl, + lib, + pcre2, + fetchFromGitHub, + php, + fetchpatch, +}: let version = "5.1.23"; -in buildPecl { +in +buildPecl { inherit version; pname = "apcu"; @@ -16,9 +24,15 @@ in buildPecl { buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; - checkFlagsArray = [ "REPORT_EXIT_STATUS=1" "NO_INTERACTION=1" ]; + checkFlagsArray = [ + "REPORT_EXIT_STATUS=1" + "NO_INTERACTION=1" + ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = with lib; { changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}"; diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index d04ba25b7f111..662588be521ce 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -1,8 +1,13 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: let version = "1.1.1"; -in buildPecl { +in +buildPecl { inherit version; pname = "ast"; diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index f9b77995e56ed..0f13c2a09ab8f 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -1,4 +1,8 @@ -{ lib, php82, fetchFromGitHub }: +{ + lib, + php82, + fetchFromGitHub, +}: php82.buildComposerProject (finalAttrs: { pname = "box"; diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 1b6b3f6be9d4e..c191d7978cd74 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -1,10 +1,11 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, installShellFiles -, php -, nix-update-script -, testers +{ + lib, + fetchFromGitHub, + fetchpatch, + installShellFiles, + php, + nix-update-script, + testers, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 28606fdfa2e27..d98c3155bb91f 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,15 @@ -{ lib -, callPackage -, fetchFromGitHub -, php -, unzip -, _7zz -, xz -, git -, curl -, cacert -, makeBinaryWrapper +{ + lib, + callPackage, + fetchFromGitHub, + php, + unzip, + _7zz, + xz, + git, + curl, + cacert, + makeBinaryWrapper, }: php.buildComposerProject (finalAttrs: { @@ -16,7 +17,7 @@ php.buildComposerProject (finalAttrs: { # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-/MAv8ES1oE++z/AVjLYEHCXo94rElAmHNv7NK7TzgeQ="; + passthru.pharHash = "sha256-KdyaGe8zU12wYbMRgLKoM6fPjSz0FFszovg1BId7ugg="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -24,20 +25,29 @@ php.buildComposerProject (finalAttrs: { }; pname = "composer"; - version = "2.7.3"; + version = "2.7.6"; src = fetchFromGitHub { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-4cQ/p6lC8qgba/GSKuP2rFc0mZrUc+HuwvBMXnVERoU="; + hash = "sha256-LZwg3PR3zl07Nb6MS8oKkRfjLgqtT/c4sfUOzWE4S+U="; }; nativeBuildInputs = [ makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/composer \ - --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} + --prefix PATH : ${ + lib.makeBinPath [ + _7zz + cacert + curl + git + unzip + xz + ] + } ''; vendorHash = "sha256-dNNV9fTyGyRoGeDV/vBjn0aMgkaUMsrKQv5AOoiYokQ="; diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 2ff867348db54..e638d4c470abd 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: +{ + lib, + buildPecl, + fetchFromGitHub, + writeText, + libcouchbase, + zlib, + php, + substituteAll, +}: let pname = "couchbase"; version = "3.2.2"; @@ -15,7 +24,10 @@ buildPecl { configureFlags = [ "--with-couchbase" ]; - buildInputs = [ libcouchbase zlib ]; + buildInputs = [ + libcouchbase + zlib + ]; patches = [ (substituteAll { diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 2b8b7ea4fb7fb..15b16582435dd 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, buildPecl -, cargo -, rustc -, fetchFromGitHub -, rustPlatform -, curl -, pcre2 -, libiconv -, darwin +{ + lib, + stdenv, + buildPecl, + cargo, + rustc, + fetchFromGitHub, + rustPlatform, + curl, + pcre2, + libiconv, + darwin, }: buildPecl rec { @@ -32,31 +33,39 @@ buildPecl rec { env.NIX_CFLAGS_COMPILE = "-O2"; - nativeBuildInputs = [ - cargo - rustc - ] ++ lib.optionals stdenv.isLinux [ - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.rustPlatform.bindgenHook - darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook - ]; + nativeBuildInputs = + [ + cargo + rustc + ] + ++ lib.optionals stdenv.isLinux [ + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.rustPlatform.bindgenHook + darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook + ]; - buildInputs = [ - curl - pcre2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - libiconv - ]; + buildInputs = + [ + curl + pcre2 + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + libiconv + ]; meta = { changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md"; description = "Datadog Tracing PHP Client"; homepage = "https://github.com/DataDog/dd-trace-php"; - license = with lib.licenses; [ asl20 bsd3 ]; + license = with lib.licenses; [ + asl20 + bsd3 + ]; maintainers = lib.teams.php.members; }; } diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix index 44a2e97f7ab7a..d50bc73060f67 100644 --- a/pkgs/development/php-packages/deployer/default.nix +++ b/pkgs/development/php-packages/deployer/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix index 7e37c8a2d3e0f..6d44b0aaabcb0 100644 --- a/pkgs/development/php-packages/ds/default.nix +++ b/pkgs/development/php-packages/ds/default.nix @@ -1,8 +1,15 @@ -{ buildPecl, lib, pcre2, php, fetchFromGitHub }: +{ + buildPecl, + lib, + pcre2, + php, + fetchFromGitHub, +}: let version = "1.5.0"; -in buildPecl { +in +buildPecl { inherit version; pname = "ds"; diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index a497d934627a0..46107a446c4a7 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -1,4 +1,11 @@ -{ buildPecl, lib, php, pkg-config, openssl, libevent }: +{ + buildPecl, + lib, + php, + pkg-config, + openssl, + libevent, +}: buildPecl { pname = "event"; @@ -19,7 +26,10 @@ buildPecl { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libevent ]; + buildInputs = [ + openssl + libevent + ]; internalDeps = [ php.extensions.sockets ]; meta = with lib; { diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix index 1341ca2d16962..7e646e151cf2c 100644 --- a/pkgs/development/php-packages/gnupg/default.nix +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -1,8 +1,17 @@ -{ buildPecl, lib, gpgme, file, gnupg, php, fetchFromGitHub }: +{ + buildPecl, + lib, + gpgme, + file, + gnupg, + php, + fetchFromGitHub, +}: let version = "1.5.1"; -in buildPecl { +in +buildPecl { inherit version; pname = "gnupg"; diff --git a/pkgs/development/php-packages/grpc/default.nix b/pkgs/development/php-packages/grpc/default.nix index e70432f37ee83..5dcd2a4a33ef3 100644 --- a/pkgs/development/php-packages/grpc/default.nix +++ b/pkgs/development/php-packages/grpc/default.nix @@ -1,7 +1,8 @@ -{ buildPecl -, pkg-config -, lib -, grpc +{ + buildPecl, + pkg-config, + lib, + grpc, }: buildPecl { diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 4d1b2438950cf..5a585bdca7d7b 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -1,6 +1,7 @@ -{ fetchFromGitHub -, lib -, php +{ + fetchFromGitHub, + lib, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index b2f8c270c4e26..6b8d426c379fb 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -7,7 +7,10 @@ buildPecl { configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = { description = "Binary serialization for PHP"; diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 5150833945b08..d8570ee24ba8e 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -1,4 +1,10 @@ -{ buildPecl, lib, imagemagick, pkg-config, pcre2 }: +{ + buildPecl, + lib, + imagemagick, + pkg-config, + pcre2, +}: buildPecl { pname = "imagick"; diff --git a/pkgs/development/php-packages/inotify/default.nix b/pkgs/development/php-packages/inotify/default.nix index 4296df1d81ba6..b68af7ec6e803 100644 --- a/pkgs/development/php-packages/inotify/default.nix +++ b/pkgs/development/php-packages/inotify/default.nix @@ -1,6 +1,4 @@ -{ buildPecl -, lib -}: +{ buildPecl, lib }: buildPecl { pname = "inotify"; diff --git a/pkgs/development/php-packages/ioncube-loader/default.nix b/pkgs/development/php-packages/ioncube-loader/default.nix index 290abdffbedd8..4c691a913ddd6 100644 --- a/pkgs/development/php-packages/ioncube-loader/default.nix +++ b/pkgs/development/php-packages/ioncube-loader/default.nix @@ -1,7 +1,8 @@ -{ stdenv -, lib -, fetchzip -, php +{ + stdenv, + lib, + fetchzip, + php, }: let @@ -42,7 +43,9 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/lib/php/extensions - cp $src/ioncube_loader_${variant.${stdenv.hostPlatform.system}.prefix}_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so + cp $src/ioncube_loader_${ + variant.${stdenv.hostPlatform.system}.prefix + }_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so ''; meta = with lib; { @@ -52,6 +55,11 @@ stdenv.mkDerivation { sourceProvenance = [ sourceTypes.binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ neverbehave ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; } diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index c6d0975d7bcf2..e0dba768aa806 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, php }: +{ + buildPecl, + lib, + php, +}: buildPecl { pname = "mailparse"; diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 80f54c567683f..33c9fba690d6e 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, fetchFromGitHub, libmaxminddb }: +{ + buildPecl, + lib, + fetchFromGitHub, + libmaxminddb, +}: let pname = "maxminddb"; version = "1.11.1"; diff --git a/pkgs/development/php-packages/memcache/default.nix b/pkgs/development/php-packages/memcache/default.nix index 6cb205c61ff69..30180ed16723a 100644 --- a/pkgs/development/php-packages/memcache/default.nix +++ b/pkgs/development/php-packages/memcache/default.nix @@ -1,4 +1,11 @@ -{ buildPecl, lib, fetchFromGitHub, php, zlib, pkg-config }: +{ + buildPecl, + lib, + fetchFromGitHub, + php, + zlib, + pkg-config, +}: buildPecl rec { pname = "memcache"; @@ -11,13 +18,9 @@ buildPecl rec { hash = "sha256-77GvQ59XUpIZmdYZP6IhtjdkYwXKuNBSG+LBScz2BtI="; }; - internalDeps = [ - php.extensions.session - ]; + internalDeps = [ php.extensions.session ]; - configureFlags = [ - "--with-zlib-dir=${zlib.dev}" - ]; + configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 9724904d52b35..bbf4f9856f3d7 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -1,4 +1,13 @@ -{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }: +{ + buildPecl, + lib, + fetchFromGitHub, + php, + cyrus_sasl, + zlib, + pkg-config, + libmemcached, +}: buildPecl rec { pname = "memcached"; @@ -11,9 +20,7 @@ buildPecl rec { sha256 = "sha256-g9IzGSZUxLlOE32o9ZJOa3erb5Qs1ntR8nzS3kRd/EU="; }; - internalDeps = [ - php.extensions.session - ]; + internalDeps = [ php.extensions.session ]; configureFlags = [ "--with-zlib-dir=${zlib.dev}" @@ -21,7 +28,10 @@ buildPecl rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cyrus_sasl zlib ]; + buildInputs = [ + cyrus_sasl + zlib + ]; meta = with lib; { description = "PHP extension for interfacing with memcached via libmemcached library"; diff --git a/pkgs/development/php-packages/meminfo/default.nix b/pkgs/development/php-packages/meminfo/default.nix index d170243be20c1..d7cca10ba3283 100644 --- a/pkgs/development/php-packages/meminfo/default.nix +++ b/pkgs/development/php-packages/meminfo/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: buildPecl rec { version = "unstable-2022-03-25"; diff --git a/pkgs/development/php-packages/memprof/default.nix b/pkgs/development/php-packages/memprof/default.nix index 04ef8e6be590b..f5839e9663e99 100644 --- a/pkgs/development/php-packages/memprof/default.nix +++ b/pkgs/development/php-packages/memprof/default.nix @@ -1,12 +1,14 @@ -{ buildPecl -, lib -, fetchFromGitHub -, judy +{ + buildPecl, + lib, + fetchFromGitHub, + judy, }: let version = "3.0.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "memprof"; @@ -17,9 +19,7 @@ in buildPecl { hash = "sha256-K8YcvCobErBkaWFTkVGLXXguQPOLIgQuRGWJF+HAIRA="; }; - configureFlags = [ - "--with-judy-dir=${judy}" - ]; + configureFlags = [ "--with-judy-dir=${judy}" ]; doCheck = true; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 02771c90167ee..f74153ca28f75 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, buildPecl -, fetchFromGitHub -, lib -, libiconv -, pcre2 -, pkg-config -, cyrus_sasl -, icu64 -, openssl -, snappy -, zlib -, darwin +{ + stdenv, + buildPecl, + fetchFromGitHub, + lib, + libiconv, + pcre2, + pkg-config, + cyrus_sasl, + icu64, + openssl, + snappy, + zlib, + darwin, }: buildPecl rec { @@ -26,18 +27,20 @@ buildPecl rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - cyrus_sasl - icu64 - openssl - snappy - zlib - pcre2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem - libiconv - ]; + buildInputs = + [ + cyrus_sasl + icu64 + openssl + snappy + zlib + pcre2 + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk_11_0.Libsystem + libiconv + ]; meta = { description = "The Official MongoDB PHP driver"; diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index 495d511f3aae2..bd0fe21e2401d 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -1,16 +1,27 @@ -{ buildPecl, lib, oracle-instantclient, php }: +{ + buildPecl, + lib, + oracle-instantclient, + php, +}: let - versionData = if (lib.versionOlder php.version "8.1") then { - version = "3.0.1"; - sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; - } else if (lib.versionOlder php.version "8.2") then { - version = "3.2.1"; - sha256 = "sha256-zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; - } else { - version = "3.3.0"; - sha256 = "sha256-0y5VnRKspJYE6xWeBcX2OG2pJTNbB+27GMywDv4gzwQ="; - }; + versionData = + if (lib.versionOlder php.version "8.1") then + { + version = "3.0.1"; + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; + } + else if (lib.versionOlder php.version "8.2") then + { + version = "3.2.1"; + sha256 = "sha256-zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; + } + else + { + version = "3.3.0"; + sha256 = "sha256-0y5VnRKspJYE6xWeBcX2OG2pJTNbB+27GMywDv4gzwQ="; + }; in buildPecl { pname = "oci8"; diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index dd0dd17b244d4..83c59fb3212c3 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -1,8 +1,16 @@ -{ lib, stdenv, buildPecl, valgrind, pcre2, fetchFromGitHub }: +{ + lib, + stdenv, + buildPecl, + valgrind, + pcre2, + fetchFromGitHub, +}: let version = "22.1.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "openswoole"; diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix index 6770ecb432a6d..98410f6b3fb3f 100644 --- a/pkgs/development/php-packages/opentelemetry/default.nix +++ b/pkgs/development/php-packages/opentelemetry/default.nix @@ -1,8 +1,13 @@ -{ lib, buildPecl, fetchFromGitHub }: +{ + lib, + buildPecl, + fetchFromGitHub, +}: let version = "1.0.2"; -in buildPecl rec { +in +buildPecl rec { inherit version; pname = "opentelemetry"; diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index a25479893dbfe..ccce782c168ab 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -1,8 +1,15 @@ -{ buildPecl, lib, php, pcre2, fetchFromGitHub }: +{ + buildPecl, + lib, + php, + pcre2, + fetchFromGitHub, +}: let version = "1.0.11"; -in buildPecl { +in +buildPecl { inherit version; pname = "pcov"; diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix index 19312ef985c04..b6b86b13393bd 100644 --- a/pkgs/development/php-packages/pdlib/default.nix +++ b/pkgs/development/php-packages/pdlib/default.nix @@ -1,4 +1,10 @@ -{ buildPecl, fetchFromGitHub, lib, pkg-config, dlib }: +{ + buildPecl, + fetchFromGitHub, + lib, + pkg-config, + dlib, +}: let pname = "pdlib"; version = "1.1.0"; diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index c8411a1e8ee06..7da343ac55649 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -1,4 +1,11 @@ -{ stdenv, buildPecl, lib, libiconv, unixODBC, php }: +{ + stdenv, + buildPecl, + lib, + libiconv, + unixODBC, + php, +}: buildPecl { pname = "pdo_sqlsrv"; diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 07854fdf3b119..a8d19fa96b0a6 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -1,4 +1,11 @@ -{ buildPecl, lib, pcre2, fetchFromGitHub, php, pkg-config }: +{ + buildPecl, + lib, + pcre2, + fetchFromGitHub, + php, + pkg-config, +}: buildPecl rec { pname = "phalcon"; @@ -11,7 +18,10 @@ buildPecl rec { hash = "sha256-AgyV9pxyXcXuhrRgozN2p67u8xZMepbWrzYaBZMFn6k="; }; - internalDeps = [ php.extensions.session php.extensions.pdo ]; + internalDeps = [ + php.extensions.session + php.extensions.pdo + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre2 ]; diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index e390389eef227..af95847c37bf0 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -1,30 +1,32 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: -(php.withExtensions({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject (finalAttrs: { - pname = "phan"; - version = "5.4.3"; +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject + (finalAttrs: { + pname = "phan"; + version = "5.4.3"; - src = fetchFromGitHub { - owner = "phan"; - repo = "phan"; - rev = finalAttrs.version; - hash = "sha256-O0dtnDsz6X99B99VbRQf3Wr/xJfsJqd+2l5Z5iWxHyU="; - }; + src = fetchFromGitHub { + owner = "phan"; + repo = "phan"; + rev = finalAttrs.version; + hash = "sha256-O0dtnDsz6X99B99VbRQf3Wr/xJfsJqd+2l5Z5iWxHyU="; + }; - vendorHash = "sha256-yE85MBseJa0VGV5EbjT0te4QT3697YvtumGkMMfZtxI="; + vendorHash = "sha256-yE85MBseJa0VGV5EbjT0te4QT3697YvtumGkMMfZtxI="; - meta = { - description = "Static analyzer for PHP"; - homepage = "https://github.com/phan/phan"; - license = lib.licenses.mit; - longDescription = '' - Phan is a static analyzer for PHP. Phan prefers to avoid false-positives - and attempts to prove incorrectness rather than correctness. - ''; - mainProgram = "phan"; - maintainers = with lib.maintainers; [ apeschar ] ++ lib.teams.php.members; - }; -}) + meta = { + description = "Static analyzer for PHP"; + homepage = "https://github.com/phan/phan"; + license = lib.licenses.mit; + longDescription = '' + Phan is a static analyzer for PHP. Phan prefers to avoid false-positives + and attempts to prove incorrectness rather than correctness. + ''; + mainProgram = "phan"; + maintainers = with lib.maintainers; [ apeschar ] ++ lib.teams.php.members; + }; + }) diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index 9c0a155ff726e..dfda99220f9b0 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -1,29 +1,31 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: -(php.withExtensions({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject (finalAttrs: { - pname = "phing"; - version = "3.0.0-rc6"; +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject + (finalAttrs: { + pname = "phing"; + version = "3.0.0-rc6"; - src = fetchFromGitHub { - owner = "phingofficial"; - repo = "phing"; - rev = finalAttrs.version; - hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc="; - }; + src = fetchFromGitHub { + owner = "phingofficial"; + repo = "phing"; + rev = finalAttrs.version; + hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc="; + }; - # TODO: Open a PR against https://github.com/phingofficial/phing - # Their `composer.lock` is out of date therefore, we need to provide one - composerLock = ./composer.lock; - vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ="; + # TODO: Open a PR against https://github.com/phingofficial/phing + # Their `composer.lock` is out of date therefore, we need to provide one + composerLock = ./composer.lock; + vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ="; - meta = { - description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; - homepage = "https://github.com/phingofficial/phing"; - license = lib.licenses.lgpl3; - mainProgram = "phing"; - maintainers = lib.teams.php.members; - }; -}) + meta = { + description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; + homepage = "https://github.com/phingofficial/phing"; + license = lib.licenses.lgpl3; + mainProgram = "phing"; + maintainers = lib.teams.php.members; + }; + }) diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix index f8efa3621ede8..82b5681cb1682 100644 --- a/pkgs/development/php-packages/phive/default.nix +++ b/pkgs/development/php-packages/phive/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix index 0075c387d6e33..5ea2977be6f91 100644 --- a/pkgs/development/php-packages/php-codesniffer/default.nix +++ b/pkgs/development/php-packages/php-codesniffer/default.nix @@ -1,6 +1,7 @@ -{ fetchFromGitHub -, lib -, php +{ + fetchFromGitHub, + lib, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 351d2e4d7b905..92f61c96166c3 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index fbd6e264e1afc..dc14ac21981e5 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -1,6 +1,7 @@ -{ fetchFromGitHub -, lib -, php +{ + fetchFromGitHub, + lib, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index dd5b1ebce02b6..36b877d2413d4 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 4c08728ae7bb0..ae190e9102a4d 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/phpspy/default.nix b/pkgs/development/php-packages/phpspy/default.nix index 4ae9f22c1a10b..5cc936a63dd8f 100644 --- a/pkgs/development/php-packages/phpspy/default.nix +++ b/pkgs/development/php-packages/phpspy/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, php -, testers -, phpPackages +{ + lib, + stdenv, + fetchFromGitHub, + php, + testers, + phpPackages, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index c206a881eb156..20fc867fd9771 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,4 +1,8 @@ -{ fetchFromGitHub, lib, php }: +{ + fetchFromGitHub, + lib, + php, +}: php.buildComposerProject (finalAttrs: { pname = "phpstan"; diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 7d4e020f406b6..759d02b9c352f 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: buildPecl rec { pname = "pinba"; @@ -7,7 +11,7 @@ buildPecl rec { src = fetchFromGitHub { owner = "tony2001"; repo = "pinba_extension"; - rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; + rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy"; }; diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index 94c15c95946a5..4d84d91832143 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, pcre2 }: +{ + buildPecl, + lib, + pcre2, +}: buildPecl { pname = "protobuf"; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index b20bbbf301c6c..842b96a828faf 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index 1f443f136578d..1e75910a496c6 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -1,4 +1,8 @@ -{ fetchFromGitHub, lib, php }: +{ + fetchFromGitHub, + lib, + php, +}: php.buildComposerProject (finalAttrs: { pname = "psysh"; diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index f07bc87dd39b5..71d411b594e94 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, rdkafka, pcre2 }: +{ + buildPecl, + lib, + rdkafka, + pcre2, +}: buildPecl { pname = "rdkafka"; @@ -6,7 +11,10 @@ buildPecl { version = "6.0.3"; sha256 = "sha256-Euqrl21JaX4x8WOLR4ietexhrbdYcIlBESsVf47H3Ug="; - buildInputs = [ rdkafka pcre2 ]; + buildInputs = [ + rdkafka + pcre2 + ]; postPhpize = '' substituteInPlace configure \ diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index 4fc9d9464793d..b5219da07da37 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -1,8 +1,14 @@ -{ buildPecl, lib, php, fetchFromGitHub }: +{ + buildPecl, + lib, + php, + fetchFromGitHub, +}: let version = "6.0.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "redis"; @@ -13,9 +19,7 @@ in buildPecl { hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M="; }; - internalDeps = with php.extensions; [ - session - ]; + internalDeps = with php.extensions; [ session ]; meta = with lib; { changelog = "https://github.com/phpredis/phpredis/releases/tag/${version}"; diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index ee393c91d5686..3120607482c7b 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchurl -, php -, openssl -, hiredis -, zstd -, lz4 -, autoPatchelfHook -, writeShellScript -, curl -, common-updater-scripts +{ + stdenv, + lib, + fetchurl, + php, + openssl, + hiredis, + zstd, + lz4, + autoPatchelfHook, + writeShellScript, + curl, + common-updater-scripts, }: let @@ -53,11 +54,19 @@ let }; }; - makeSource = { system, phpMajor }: fetchurl { - url = "https://builds.r2.relay.so/v${version}/relay-v${version}-php" - + phpMajor + "-" + hashes.${system}.platform + ".tar.gz"; - sha256 = hashes.${system}.hash.${phpMajor} or (throw "Unsupported PHP version for relay ${phpMajor} on ${system}"); - }; + makeSource = + { system, phpMajor }: + fetchurl { + url = + "https://builds.r2.relay.so/v${version}/relay-v${version}-php" + + phpMajor + + "-" + + hashes.${system}.platform + + ".tar.gz"; + sha256 = + hashes.${system}.hash.${phpMajor} + or (throw "Unsupported PHP version for relay ${phpMajor} on ${system}"); + }; in stdenv.mkDerivation (finalAttrs: { inherit version; @@ -68,50 +77,65 @@ stdenv.mkDerivation (finalAttrs: { system = stdenv.hostPlatform.system; phpMajor = lib.versions.majorMinor php.version; }; - nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ - autoPatchelfHook - ]; + nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ openssl zstd lz4 ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/php/extensions - cp relay-pkg.so $out/lib/php/extensions/relay.so - chmod +w $out/lib/php/extensions/relay.so - '' + (if stdenv.isDarwin then - let - args = lib.strings.concatMapStrings - (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}") - (with lib.attrsets; [ - (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis) - (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis) - (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl) - (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl) - (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd) - (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4) - ]); - in - # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths + installPhase = '' - install_name_tool${args} $out/lib/php/extensions/relay.so + runHook preInstall + + mkdir -p $out/lib/php/extensions + cp relay-pkg.so $out/lib/php/extensions/relay.so + chmod +w $out/lib/php/extensions/relay.so '' - else - "") + '' - # Random UUID that's required by the extension. Can be anything, but must be different from default. - sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so - chmod -w $out/lib/php/extensions/relay.so + + ( + if stdenv.isDarwin then + let + args = + lib.strings.concatMapStrings + ( + v: + " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}" + ) + ( + with lib.attrsets; + [ + (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis) + (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis) + (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl) + (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl) + (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd) + (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4) + ] + ); + in + # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths + '' + install_name_tool${args} $out/lib/php/extensions/relay.so + '' + else + "" + ) + + '' + # Random UUID that's required by the extension. Can be anything, but must be different from default. + sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so + chmod -w $out/lib/php/extensions/relay.so - runHook postInstall - ''; + runHook postInstall + ''; passthru = { updateScript = writeShellScript "update-${finalAttrs.pname}" '' set -o errexit - export PATH="$PATH:${lib.makeBinPath [ curl common-updater-scripts ]}" + export PATH="$PATH:${ + lib.makeBinPath [ + curl + common-updater-scripts + ] + }" NEW_VERSION=$(curl --silent https://builds.r2.relay.so/meta/builds | tail -n1 | cut -c2-) if [[ "${version}" = "$NEW_VERSION" ]]; then @@ -129,23 +153,22 @@ stdenv.mkDerivation (finalAttrs: { updateables = builtins.listToAttrs # Collect all leaf attributes (containing hashes). - (lib.collect - (attrs: attrs ? name) - # create an attr containing - (lib.mapAttrsRecursive + ( + lib.collect (attrs: attrs ? name) + # create an attr containing ( - path: _value: - lib.nameValuePair - (builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path)) - (finalAttrs.finalPackage.overrideAttrs (attrs: { + lib.mapAttrsRecursive ( + path: _value: + lib.nameValuePair (builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path)) ( + finalAttrs.finalPackage.overrideAttrs (attrs: { src = makeSource { system = builtins.head path; phpMajor = builtins.head (builtins.tail (builtins.tail path)); }; - })) + }) + ) + ) (lib.filterAttrsRecursive (name: _value: name != "platform") hashes) ) - (lib.filterAttrsRecursive (name: _value: name != "platform") hashes) - ) ); }; @@ -155,7 +178,15 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://relay.so/"; sourceProvenance = [ sourceTypes.binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ tillkruss ostrolucky ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + maintainers = with maintainers; [ + tillkruss + ostrolucky + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; }) diff --git a/pkgs/development/php-packages/rrd/default.nix b/pkgs/development/php-packages/rrd/default.nix index a89f9a3b71b16..6df71d4be53ef 100644 --- a/pkgs/development/php-packages/rrd/default.nix +++ b/pkgs/development/php-packages/rrd/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, pkg-config, rrdtool }: +{ + buildPecl, + lib, + pkg-config, + rrdtool, +}: buildPecl { pname = "rrd"; @@ -6,7 +11,10 @@ buildPecl { version = "2.0.3"; hash = "sha256-pCFh5YzcioU7cs/ymJidy96CsPdkVt1ZzgKFTJK3MPc="; - nativeBuildInputs = [ pkg-config rrdtool ]; + nativeBuildInputs = [ + pkg-config + rrdtool + ]; meta = { description = "PHP bindings to RRD tool system"; diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix index 65cfad9ea3ad2..02654068666e8 100644 --- a/pkgs/development/php-packages/smbclient/default.nix +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, samba, pkg-config }: +{ + buildPecl, + lib, + samba, + pkg-config, +}: buildPecl { pname = "smbclient"; version = "1.0.6"; diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index c3b5d84ff1958..aa5faa665afb5 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, buildPecl -, lib -, libiconv -, php -, fetchFromGitHub -, pcre2 -, darwin +{ + stdenv, + buildPecl, + lib, + libiconv, + php, + fetchFromGitHub, + pcre2, + darwin, }: buildPecl rec { @@ -19,23 +20,19 @@ buildPecl rec { hash = "sha256-NwG8gBaToBaJGrZoCD7bDym7hQidWU0ArckoQCHN81o="; }; - buildInputs = [ - pcre2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.Libsystem - libiconv - ]; + buildInputs = + [ pcre2 ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.CoreFoundation + darwin.apple_sdk_11_0.Libsystem + libiconv + ]; - internalDeps = with php.extensions; [ - session - ]; + internalDeps = with php.extensions; [ session ]; sourceRoot = "${src.name}/src"; - configureFlags = [ - "--enable-snuffleupagus" - ]; + configureFlags = [ "--enable-snuffleupagus" ]; postPhpize = '' ./configure --enable-snuffleupagus diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index b6f7598ffe5ad..10bf66272615a 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -1,8 +1,14 @@ -{ buildPecl, lib, fetchFromGitHub, zlib }: +{ + buildPecl, + lib, + fetchFromGitHub, + zlib, +}: let version = "0.4.15"; -in buildPecl { +in +buildPecl { inherit version; pname = "spx"; @@ -13,9 +19,7 @@ in buildPecl { hash = "sha256-gw6wbPt1Qy0vNfT0flq7bxpnGU3SgJvPVhk8H0Imvx4="; }; - configureFlags = [ - "--with-zlib-dir=${zlib.dev}" - ]; + configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; preConfigure = '' substituteInPlace Makefile.frag \ diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 6bbf7cc4f6d10..303f2327d1e55 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -1,4 +1,10 @@ -{ stdenv, buildPecl, lib, unixODBC, libiconv }: +{ + stdenv, + buildPecl, + lib, + unixODBC, + libiconv, +}: buildPecl { pname = "sqlsrv"; @@ -6,9 +12,7 @@ buildPecl { version = "5.10.1"; sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI="; - buildInputs = [ - unixODBC - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/pkgs/development/php-packages/ssh2/default.nix b/pkgs/development/php-packages/ssh2/default.nix index 058702d65c0b0..d3ff860de3ade 100644 --- a/pkgs/development/php-packages/ssh2/default.nix +++ b/pkgs/development/php-packages/ssh2/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, libssh2 }: +{ + buildPecl, + lib, + libssh2, +}: buildPecl rec { version = "1.3.1"; diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index f9dcb781c0e99..f519522a83578 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -1,15 +1,17 @@ -{ lib -, stdenv -, buildPecl -, php -, valgrind -, pcre2 -, fetchFromGitHub - }: +{ + lib, + stdenv, + buildPecl, + php, + valgrind, + pcre2, + fetchFromGitHub, +}: let version = "5.1.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "swoole"; diff --git a/pkgs/development/php-packages/uv/default.nix b/pkgs/development/php-packages/uv/default.nix index d681113ec6bc0..1bbc6450d0b2d 100644 --- a/pkgs/development/php-packages/uv/default.nix +++ b/pkgs/development/php-packages/uv/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, fetchFromGitHub, libuv }: +{ + buildPecl, + lib, + fetchFromGitHub, + libuv, +}: buildPecl rec { pname = "uv"; diff --git a/pkgs/development/php-packages/vld/default.nix b/pkgs/development/php-packages/vld/default.nix index 8e5f7dec40398..6ae6a60005f2c 100644 --- a/pkgs/development/php-packages/vld/default.nix +++ b/pkgs/development/php-packages/vld/default.nix @@ -1,11 +1,13 @@ -{ lib -, buildPecl -, fetchFromGitHub +{ + lib, + buildPecl, + fetchFromGitHub, }: let version = "0.18.0"; -in buildPecl { +in +buildPecl { inherit version; pname = "vld"; @@ -20,7 +22,7 @@ in buildPecl { # Tests relies on PHP 7.0 doCheck = false; - meta = { + meta = { changelog = "https://github.com/derickr/vld/releases/tag/${version}"; description = "The Vulcan Logic Dumper hooks into the Zend Engine and dumps all the opcodes (execution units) of a script."; homepage = "https://github.com/derickr/vld"; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 3b5caffb963d3..83e6950b0fe78 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,8 +1,13 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: let version = "3.3.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "xdebug"; diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index aa825107715d4..e3fec9a5d8856 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, pkg-config, libyaml }: +{ + buildPecl, + lib, + pkg-config, + libyaml, +}: buildPecl { pname = "yaml"; @@ -8,7 +13,10 @@ buildPecl { configureFlags = [ "--with-yaml=${libyaml.dev}" ]; - nativeBuildInputs = [ pkg-config libyaml ]; + nativeBuildInputs = [ + pkg-config + libyaml + ]; meta = { description = "YAML-1.1 parser and emitter"; diff --git a/pkgs/development/php-packages/zstd/default.nix b/pkgs/development/php-packages/zstd/default.nix index a9428ca477a0b..73334f675c3d6 100644 --- a/pkgs/development/php-packages/zstd/default.nix +++ b/pkgs/development/php-packages/zstd/default.nix @@ -1,8 +1,15 @@ -{ buildPecl, lib, zstd, pkg-config, fetchFromGitHub }: +{ + buildPecl, + lib, + zstd, + pkg-config, + fetchFromGitHub, +}: let version = "0.13.3"; -in buildPecl { +in +buildPecl { inherit version; pname = "zstd"; @@ -13,15 +20,11 @@ in buildPecl { hash = "sha256-jEuL93ScF0/FlfUvib6uZafOkIe0+VkWV/frpSjTkvY="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zstd ]; - configureFlags = [ - "--with-libzstd" - ]; + configureFlags = [ "--with-libzstd" ]; meta = with lib; { description = "Zstd Extension for PHP"; diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 99d8175b62ed2..9cb79bf9d2fac 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -1,21 +1,21 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, freezegun -, mashumaro -, poetry-core -, pyjwt -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, syrupy +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + freezegun, + mashumaro, + poetry-core, + pyjwt, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + syrupy, }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.4.0"; + version = "2024.4.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,21 +24,19 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-W6aZdvg+EZKv0pmIaPOBaJaWipq3AENTVAVon/lFuI4="; + hash = "sha256-/mwKomgY+yifN27bpCK9FjhbZRdllr471Ku+Kn2rUPM="; }; postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail "--cov" "" ''; - nativeBuildInputs = [ - poetry-core - setuptools - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp mashumaro pyjwt @@ -51,13 +49,9 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "aioautomower" - ]; + pythonImportsCheck = [ "aioautomower" ]; - pytestFlagsArray = [ - "--snapshot-update" - ]; + pytestFlagsArray = [ "--snapshot-update" ]; disabledTests = [ # File is missing diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index 377c967986296..aaab9a1a4cc5e 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -1,30 +1,56 @@ { lib , buildPythonPackage -, isPy27 -, fetchPypi +, pythonOlder +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies , aiohttp -, click +, incremental + +# tests +, aioresponses +, pytest-aiohttp +, pytest-asyncio +, pytest-socket +, pytestCheckHook +, syrupy }: buildPythonPackage rec { pname = "aioazuredevops"; - version = "1.4.3"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.11"; - src = fetchPypi { - inherit pname version; - hash = "sha256-vNTvSQYjjptdPsHz0zM9paq3iodZrhcEralPm6YRZJE="; + src = fetchFromGitHub { + owner = "timmo001"; + repo = "aioazuredevops"; + rev = "refs/tags/${version}"; + hash = "sha256-QEIVAcBoTvuOeLN2kfDa3uYfrUm5Qu1TLp9C0uU+mW4="; }; - propagatedBuildInputs = [ + build-system = [ + incremental + setuptools + ]; + + dependencies = [ aiohttp - click + incremental ]; - # no tests implemented - doCheck = false; + nativeCheckInputs = [ + aioresponses + pytest-aiohttp + pytest-asyncio + pytest-socket + pytestCheckHook + syrupy + ]; pythonImportsCheck = [ "aioazuredevops.builds" @@ -33,6 +59,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/timmo001/aioazuredevops/releases/tag/${version}"; description = "Get data from the Azure DevOps API"; mainProgram = "aioazuredevops"; homepage = "https://github.com/timmo001/aioazuredevops"; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 282e27f3f8af4..fff33bbb6aca0 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "23.2.0"; + version = "24.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-GFQ87Ic0xHXs8ZgmzH7kOFbDSNmtj0hx+YHKnrz/sG0="; + hash = "sha256-wQR3dwN5O++TdtQh+Wcj7c7TNMaRj2lMlOuXOAPVU0Q="; }; build-system = [ diff --git a/pkgs/development/python-modules/aiohttp-isal/default.nix b/pkgs/development/python-modules/aiohttp-isal/default.nix new file mode 100644 index 0000000000000..dbaac3028777e --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-isal/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, poetry-core + +# dependencies +, aiohttp +, isal + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiohttp-isal"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-isal"; + rev = "v${version}"; + hash = "sha256-rSXV5Z5JdznQGtRI83UIbaSfbIYkUHphJTVK/LM2V4U="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + aiohttp + isal + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + + pythonImportsCheck = [ + "aiohttp_isal" + ]; + + meta = with lib; { + changelog = "https://github.com/bdraco/aiohttp-isal/blob/${src.rev}/CHANGELOG.md"; + description = "Isal support for aiohttp"; + homepage = "https://github.com/bdraco/aiohttp-isal"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-session/default.nix b/pkgs/development/python-modules/aiohttp-session/default.nix new file mode 100644 index 0000000000000..31acba3ebd529 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-session/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, aiohttp + +# optional-dependencies +, aiomcache +, cryptography +, pynacl +, redis +}: + +buildPythonPackage rec { + pname = "aiohttp-session"; + version = "2.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiohttp-session"; + rev = "v${version}"; + hash = "sha256-7MNah4OIQnoxLoZkLOdeu5uCwSyPMhc6Wsht8dFconc="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp + ]; + + optional-dependencies = { + aioredis = [ redis ]; + aiomcache = [ aiomcache ]; + pycrypto = [ cryptography ]; + secure = [ cryptography ]; + pynacl = [ pynacl ]; + }; + + doCheck = false; # runs redis in docker + + pythonImportsCheck = [ + "aiohttp_session" + ]; + + meta = with lib; { + description = "Web sessions for aiohttp.web"; + homepage = "https://github.com/aio-libs/aiohttp-session"; + changelog = "https://github.com/aio-libs/aiohttp-session/blob/${src.rev}/CHANGES.txt"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/aiomcache/default.nix b/pkgs/development/python-modules/aiomcache/default.nix new file mode 100644 index 0000000000000..d7315a0cd5e9d --- /dev/null +++ b/pkgs/development/python-modules/aiomcache/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, setuptools + +# dependencies +, python-memcached +, typing-extensions +}: + +buildPythonPackage rec { + pname = "aiomcache"; + version = "0.8.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiomcache"; + rev = "v${version}"; + hash = "sha256-oRMN1seEjFSsq4wjkIXHM7Osq8y/5WFExGCEr6eM9vc="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + python-memcached + ] ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + + doCheck = false; # executes memcached in docker + + pythonImportsCheck = [ + "aiomcache" + ]; + + meta = with lib; { + changelog = "https://github.com/aio-libs/aiomcache/blob/${src.rev}/CHANGES.rst"; + description = "Minimal asyncio memcached client"; + homepage = "https://github.com/aio-libs/aiomcache/"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 55c60d8e921a8..8011abb1882c6 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,34 +1,33 @@ -{ lib -, aiohttp -, bluetooth-data-tools -, buildPythonPackage -, fetchFromGitHub -, habluetooth -, orjson -, pythonOlder -, setuptools -, yarl +{ + lib, + aiohttp, + bluetooth-data-tools, + buildPythonPackage, + fetchFromGitHub, + habluetooth, + orjson, + pythonOlder, + setuptools, + yarl, }: buildPythonPackage rec { pname = "aioshelly"; - version = "8.2.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-ZJ6lb3pd8DhNagaVq1uFwadtviuHCg44YZkh29ipu5U="; + hash = "sha256-yVjQlP4vIs3Nk94ZcafpLzxVMIJfLsPGee5G5IdnCRs="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp bluetooth-data-tools habluetooth @@ -39,9 +38,7 @@ buildPythonPackage rec { # Project has no test doCheck = false; - pythonImportsCheck = [ - "aioshelly" - ]; + pythonImportsCheck = [ "aioshelly" ]; meta = with lib; { description = "Python library to control Shelly"; diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index c1fbd475bc07f..3b64d927324eb 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "art"; - version = "6.1"; + version = "6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; - rev = "v${version}"; - hash = "sha256-RJexYOGWwAwxQ7lWGgXzFSR2aly1twB9pC4QFs5m7k8="; + rev = "refs/tags/v${version}"; + hash = "sha256-lFe6J3R+A1WE+LGywupjOGwhOcrUH5JE26Cit0DaT/4="; }; pythonImportsCheck = [ "art" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 94417bc47ec75..f6dd8f3c1068c 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "29.1.0"; + version = "30.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RohxeLsQNZM/BvpjEhwaydTFhx8gKuK4a8Svbh47NU8="; + hash = "sha256-bGLmrFkONP7dc5/iSzGzdQcToBRhZpbqjUTHvMgcBrc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 7f760eecf397e..9bbf7cec42ee9 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "6.1.0"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9WMsfVh9ca/nbbTPVuj1BwhIv6kGZlPbTzqzhvadBps="; + hash = "sha256-99uvyPwzRnUxp4ePA5Xa19QVTRvkAjvHDVIGgbcBP7o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 5f6377d54edd3..5399eef058a88 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.5.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XxowjEhYx5uD/4vY5hGSCSvcarmdbdc5Y2GLHciEurU="; + hash = "sha256-3yEt+t+8xlnDEjHD4XCqt8IRRNFysPiCaKsPWtjpWII="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index df19afca09d5a..421e97de15eb9 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gibberish-detector -, mock -, pkgs -, pyahocorasick -, pytestCheckHook -, pythonOlder -, pyyaml -, requests -, responses -, setuptools -, unidiff +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gibberish-detector, + mock, + pkgs, + pyahocorasick, + pytestCheckHook, + pythonOlder, + pyyaml, + requests, + responses, + setuptools, + unidiff, }: buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.5"; + version = "1.5.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,12 +26,10 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-05hxc34ecSoAp0GBVf9yq2BC928wxZOLZJHAbJ7cdtk="; + hash = "sha256-3O1taxOxVI+36h2Qz+dzOuilmapm9QO4X4XjRgX4kUc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pyyaml @@ -39,12 +38,8 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - word_list = [ - pyahocorasick - ]; - gibberish = [ - gibberish-detector - ]; + word_list = [ pyahocorasick ]; + gibberish = [ gibberish-detector ]; }; nativeCheckInputs = [ @@ -71,9 +66,7 @@ buildPythonPackage rec { "TestModifiesBaselineFromVersionChange" ]; - pythonImportsCheck = [ - "detect_secrets" - ]; + pythonImportsCheck = [ "detect_secrets" ]; meta = with lib; { description = "Tool to detect secrets in the code"; @@ -82,4 +75,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ fab ]; }; } - diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 38c938bb74247..56c13317d7970 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -4,7 +4,6 @@ , click , click-log , fetchFromGitHub -, fetchpatch2 , pure-pcapy3 , pyserial-asyncio , pytest-asyncio @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.38.1"; + version = "0.38.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,16 +26,9 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-oxPzjDb+FdHeHsgeGKH3SVvKb0vCB9dIhT7lGzhDcBw="; + hash = "sha256-IyJQgKTRrff/LqY14IaATrJTkmVDEv0JFHAxCydNk7Y="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/zigpy/bellows/commit/7833647083f27f55b7ad345f4aaa7dffaa369abc.patch"; - hash = "sha256-v+BOPqikWoyNtZ1qRWe3RwraG6nQnfZqoV6yj9PpGX8="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools-git-versioning<2"' "" \ diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 48ddcc9e7d629..39c8874f7f3f6 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -18,26 +18,26 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.6"; + version = "0.15.2"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-/FL9czp5x/BcKSXXzT19kgGiPFd61BpU7HLtgyyHlIs="; + hash = "sha256-UCzPD+3v74eB32q0/blsyHAsN0yNskGky5nrBKzFFaE="; }; - nativeBuildInputs = [ + build-system = [ pbr setuptools ]; PBR_VERSION = version; - propagatedBuildInputs = [ + dependencies = [ httpx pycryptodome pyjwt diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index cf6924f2f3d67..b9ca27e563edf 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -13,12 +13,13 @@ , pythonOlder , sphinx-rtd-theme , sphinxHook +, uart-devices , usb-devices }: buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.18.0"; + version = "0.19.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-KPmCOPCK7muT0qptJMKQwWU/6tvepkdHwlNYcrvpRLg="; + hash = "sha256-r+Ll9ODFal+I2MwrwHakPFWD3GiE/n0f/dYs69jmmpU="; }; postPatch = '' @@ -40,20 +41,21 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ + build-system = [ myst-parser poetry-core sphinx-rtd-theme sphinxHook ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiooui async-timeout bleak dbus-fast mac-vendor-lookup + uart-devices usb-devices ]; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index a3e137cae4937..861aaab2d138a 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-auto-recovery"; rev = "refs/tags/v${version}"; - hash = "sha256-4LgEb90QsjTMsVat6fe9B3b6f93bHTgJgQNsRbyti2M="; + hash = "sha256-JaFazXjbHohj4+rPkQA/SaBP0irHrre3vaCqz7T2bwE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 4f78d8728120c..b61091ca69a9e 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.20.0"; + version = "5.22.0"; pyproject = true; # chart-studio was split from plotly @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-i//LKTNmoIrusBnpfSGc9cDijPxg/dY/7fumV3kfTAY="; + hash = "sha256-cEm0vLQ4PAVxvplqK+yayxLpNCvyfZtjZva0Bl2Sdfs="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 602afd0f755f7..72a85ffab1c2b 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "cheroot"; - version = "10.0.0"; + version = "10.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WcShh3/vmWmzw8CAyqrzd+J4CRlDeFP8DTKp30CzEfA="; + hash = "sha256-4LgveXZY0muGE+yOtWPDsI5r1qeSHp1Qib0Rda0bF0A="; }; # remove setuptools-scm-git-archive dependency diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix index 0c281c29ab4c6..dd9ee1c021f26 100644 --- a/pkgs/development/python-modules/click-spinner/default.nix +++ b/pkgs/development/python-modules/click-spinner/default.nix @@ -1,30 +1,48 @@ -{ lib -, buildPythonPackage -, fetchPypi -, click -, six -, pytestCheckHook +{ + lib, + buildPythonPackage, + click, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, + six, + versioneer, }: buildPythonPackage rec { pname = "click-spinner"; version = "0.1.10"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; + hash = "sha256-h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; }; + postPatch = '' + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + nativeCheckInputs = [ click - six pytestCheckHook + six ]; + pythonImportsCheck = [ "click_spinner" ]; + meta = with lib; { description = "Add support for showwing that command line app is active to Click"; homepage = "https://github.com/click-contrib/click-spinner"; + changelog = "https://github.com/click-contrib/click-spinner/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 1bfdafaba5a4a..f7bba7ba76ec7 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.19.2"; + version = "2.19.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ENS5ayrd7gffo2meChZ9930qjVq3+G5lkOqm6ofW3Bg="; + hash = "sha256-O2AAoBojfCO8z99tICVupREex0qCaunnT58OW7WyOD8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 26deb98e3d451..73af79e3c5898 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.3.3"; + version = "5.3.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+/WcC6sN7U0oCR+gwZOhFtgwPEwLCaQnId2KEjDqJ8M="; + hash = "sha256-tFoshbAl3RU2fWm/knSN5KMOyCq7Swj6UwG3LokFH+I="; }; build-system = [ diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index e2ec8bd2d46ef..adebce0b23771 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -27,15 +27,15 @@ }: buildPythonPackage rec { pname = "conda"; - version = "24.1.2"; + version = "24.4.0"; pyproject = true; src = fetchFromGitHub { inherit pname version; owner = "conda"; repo = "conda"; - rev = version; - hash = "sha256-L/Y7Bb3R5YqXbjTN4CRPFnkgymVLrxuFmjVzpvt28dE="; + rev = "refs/tags/${version}"; + hash = "sha256-LdoBlR5EFYd2mQIjOgp1MH3w6osfRfurPq+N5Y1iaFw="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 8db83b619969c..86786baa2ee89 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "2.0.3"; + version = "2.0.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KHY605xAThWRQIdPCAEM/YoY9MKnzqHOc+lQakOAz8E="; + hash = "sha256-8fjKCvZCEvvpmxvuEl7lobU6nBtDOWjYvKiBe3nSN/M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index e19a4137e4f3d..0a42e56d405a5 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cryptodatahub"; - version = "0.12.2"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,19 +25,19 @@ buildPythonPackage rec { owner = "coroner"; repo = "cryptodatahub"; rev = "refs/tags/v${version}"; - hash = "sha256-zVHHBQYcl26zTtXPAs/AgKOojKQORu08rpkfY0l1zjM="; + hash = "sha256-+IGzXYSaeZjN5AxBu7jXgrnGtrtaSveFiVeNQRBZMNg="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto attrs pathlib2 diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index fc18fadc3a3a5..61efe59f0637e 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -1,36 +1,38 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, attrs -, asn1crypto -, cryptodatahub -, python-dateutil -, urllib3 -, pytestCheckHook +{ + lib, + asn1crypto, + attrs, + buildPythonPackage, + cryptodatahub, + fetchPypi, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, + unittestCheckHook, + urllib3, }: buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { - pname = "CryptoParser"; - inherit version; - hash = "sha256-1A0VEpUPsYtEu2aT+ldt/Z/PtV8lvD+9jSx75yGB6Ao="; + inherit pname version; + hash = "sha256-y5rpc0tn5JJQr4xdRUJbsq8XT/YqqJqZr3CXjqN7k7I="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto attrs cryptodatahub @@ -38,9 +40,7 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ - "cryptoparser" - ]; + pythonImportsCheck = [ "cryptoparser" ]; meta = with lib; { description = "Security protocol parser and generator"; diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 3555387b3ab10..0ff05992b0162 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.18.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mLiIE1RYUNUhh8nhG7TBr7XUdWlJzeWDuUNvoBk0eyw="; + hash = "sha256-m3x3/MCezA0WjYKBa2F12emMZdwLKi/9bFBf59A4qs8="; }; # remove pyarrow<14.0.1 vulnerability fix diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 899da93bfc5d4..87ac07e6a8387 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.16.0"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7UwRGVdXjcs/z/ly2VT3dYba/XGnNF/VzQadn7BQ0NE="; + hash = "sha256-Wy8d1Eje/OIG7MFumWD+k3jzIwfqH8sMKYwiwU9YyIE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 31c5b2d4e9596..6ee1ae0cc4ee1 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-RlLWC1TLjrwQ7t727WpjePJA1zGj4460Ioj6efm/jSw="; + hash = "sha256-x4P0hFsyo/QLQA+MOecbiKfZ/5TL6WKWXftsLz9XBA4="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 26b4cc7308b82..1f5c23aa1a315 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "6.0.5"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s54nQDKH1r6wUT5pQCQBfbpY0Sn9QQoQFKyKFYTnP84="; + hash = "sha256-2exD0r983yFv7Y1JSghN61dhpUhgpTsudDRqTzhM/0c="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 9c2de1bad9cef..dc775fcd6d117 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "einops"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "arogozhnikov"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wCs3rMnYCk07kJ3iPItxwCQATflKBYHk6tfBCjiF+bc="; + hash = "sha256-6x9AttvSvgYrHaS5ESKOwyEnXxD2BitYTGtqqSKur+0="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index c7be7ba9e7fa6..69d3a9ef910e8 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -1,58 +1,59 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, click -, pyscard -, pycountry -, terminaltables -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + click, + pyscard, + pycountry, + terminaltables, + pytestCheckHook, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "emv"; version = "1.0.14"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "russss"; repo = "python-emv"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-MnaeQZ0rA3i0CoUA6HgJQpwk5yo4rm9e+pc5XzRd1eg="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"enum-compat==0.0.3",' "" \ + --replace-fail '"argparse==1.4.0",' "" \ + --replace-fail "click==7.1.2" "click" \ + --replace-fail "pyscard==2.0.0" "pyscard" \ + --replace-fail "pycountry==20.7.3" "pycountry" \ + --replace-fail "terminaltables==3.1.0" "terminaltables" + ''; + + build-system = [ setuptools ]; + + dependencies = [ click pyscard pycountry terminaltables ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"enum-compat==0.0.3",' "" \ - --replace '"argparse==1.4.0",' "" \ - --replace "click==7.1.2" "click" \ - --replace "pyscard==2.0.0" "pyscard" \ - --replace "pycountry==20.7.3" "pycountry" \ - --replace "terminaltables==3.1.0" "terminaltables" - ''; - - pythonImportsCheck = [ - "emv" - ]; + pythonImportsCheck = [ "emv" ]; meta = with lib; { description = "Implementation of the EMV chip-and-pin smartcard protocol"; - mainProgram = "emvtool"; homepage = "https://github.com/russss/python-emv"; + changelog = "https://github.com/russss/python-emv/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; + mainProgram = "emvtool"; }; } diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index 7e0b2971be508..79189827c7e93 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fyta-cli"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "fyta_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ThxC+s0vkvFQw9FKMWO+cHJB1ci+USdxQa4PRqHrKLM="; + hash = "sha256-eWuuHIq79n1oFsvBfVySfGCtHz+MlFRR3j8uqtVR+V0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 297b6c9865dec..7a0529cc89af3 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,33 +1,56 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gevent -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gevent, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "gipc"; - version = "1.4.0"; - format = "setuptools"; + version = "1.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jgehrcke"; repo = "gipc"; rev = "refs/tags/${version}"; - hash = "sha256-T5TqLanODyzJGyjDZz+75bbz3THxoobYnfJFQxAB76E="; + hash = "sha256-eYE7A1VDJ0NSshvdJKxPwGyVdW6BnyWoRSR1i1iTr8Y="; }; postPatch = '' substituteInPlace setup.py \ - --replace "gevent>=1.5,<=21.12.0" "gevent>=1.5" + --replace-fail "gevent>=1.5,<=23.9.1" "gevent>=1.5" ''; - propagatedBuildInputs = [ - gevent - ]; + build-system = [ setuptools ]; + + dependencies = [ gevent ]; - nativeCheckInputs = [ - pytestCheckHook + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "gipc" ]; + + disabledTests = [ + # AttributeError + "test_all_handles_length" + "test_child" + "test_closeread" + "test_closewrite" + "test_early_readchild_exit" + "test_handlecount" + "test_handler" + "test_onewriter" + "test_readclose" + "test_singlemsg" + "test_twochannels_singlemsg" + "test_twoclose" + "test_twowriters" + "test_write_closewrite_read" ]; meta = with lib; { @@ -41,7 +64,8 @@ buildPythonPackage rec { anywhere within your gevent-powered application. ''; homepage = "http://gehrcke.de/gipc"; + changelog = "https://github.com/jgehrcke/gipc/blob/${version}/CHANGELOG.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 86a4c6248f5d4..7b0e92f8ffe1a 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -9,13 +9,14 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools , setuptools-scm , yamllint }: buildPythonPackage rec { pname = "glean-parser"; - version = "13.0.1"; + version = "14.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-/urUy+xpMO04pI31uunrTuSGu0Am3fLzIGuF+AJ50ec="; + hash = "sha256-828KUT9B09cOQrpLqfPpkxb63IounEqNOs3WWq6vGVU="; }; postPatch = '' @@ -43,6 +44,7 @@ buildPythonPackage rec { jinja2 jsonschema pyyaml + setuptools yamllint ]; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index e84fa94ae0c12..ece95d5f999eb 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -1,4 +1,5 @@ { lib +, async-interrupt , bleak , bleak-retry-connector , bluetooth-adapters @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.4.2"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,22 +26,23 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-IoVXmq9ShwLpGtoxVOtoirSirJJ1DqBI/mP7PmK7OUs="; + hash = "sha256-Qmq81iZpeLNrSIvxgkHl6ZYntlRwQPfPWRY2ZToQXCs="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=habluetooth --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=habluetooth --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ + async-interrupt bleak bleak-retry-connector bluetooth-adapters diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 42f09f7266cc2..f9309dcac3dab 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tIvNoRpKsKe2xHIyx7p8h/2jGK4tSnZigAxGWnh0KJQ="; + hash = "sha256-5LAkjFZyy5pvWXTnyPUnGgnGxmPL+KsRczoifz0tssI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix index 8e2e3fd07a81d..169950593f5a4 100644 --- a/pkgs/development/python-modules/iapws/default.nix +++ b/pkgs/development/python-modules/iapws/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iapws"; - version = "1.5.3"; + version = "1.5.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-QVxbf9EF9YwAVPewAqhc1WZD6jVr/rFXQUw/jJ7kkDU="; + hash = "sha256-nw+qOaln12/F5flfYdki4TVFMZLgK/h10HJC8T1uqlU="; }; propagatedBuildInputs = [ scipy ]; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index ca962f4e47929..1f7e7c017501a 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,26 +1,28 @@ -{ lib -, buildPythonPackage -, python-dateutil -, fetchPypi -, mock -, msgpack -, pynose -, pandas -, pytestCheckHook -, pytz -, requests -, requests-mock -, six +{ + lib, + buildPythonPackage, + fetchPypi, + mock, + msgpack, + pandas, + pynose, + pytestCheckHook, + python-dateutil, + pytz, + requests, + requests-mock, + setuptools, + six, }: buildPythonPackage rec { pname = "influxdb"; - version = "5.3.1"; - format = "setuptools"; + version = "5.3.2"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26"; + hash = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; }; postPatch = '' @@ -35,25 +37,28 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ - requests + build-system = [ setuptools ]; + + dependencies = [ + msgpack python-dateutil pytz + requests six - msgpack ]; __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - pytestCheckHook - requests-mock mock - pynose pandas + pynose + pytestCheckHook + requests-mock ]; disabledTests = [ + "socket" # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas. # https://github.com/influxdata/influxdb-python/pull/845 # Also type mismatches in assertEqual on DataFrame: @@ -78,6 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for InfluxDB"; homepage = "https://github.com/influxdb/influxdb-python"; + changelog = "https://github.com/influxdata/influxdb-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix new file mode 100644 index 0000000000000..c37d9357ec533 --- /dev/null +++ b/pkgs/development/python-modules/isal/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# native dependencies +, isa-l + +# tests +, pytest-timeout +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "isal"; + version = "1.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pycompression"; + repo = "python-isal"; + rev = "v${version}"; + hash = "sha256-EhdKT2ftyU2zevFg9Yi3q2FVx0FmKwJMzszsK1NS3Qg="; + }; + + build-system = [ + setuptools + ]; + + buildInputs = [ + isa-l + ]; + + env.PYTHON_ISAL_LINK_DYNAMIC = true; + + nativeCheckInputs = [ + pytest-timeout + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests" + ]; + + disabledTests = [ + # calls `python -m isal` and fails on import + "test_compress_fast_best_are_exclusive" + "test_compress_infile_outfile" + "test_compress_infile_outfile_default" + "test_decompress_cannot_have_flags_compression" + "test_decompress_infile_outfile_error" + ]; + + pythonImportsCheck = [ + "isal" + ]; + + meta = with lib; { + changelog = "https://github.com/pycompression/python-isal/blob/${src.rev}/CHANGELOG.rst"; + description = "Faster zlib and gzip compatible compression and decompression by providing python bindings for the isa-l library"; + homepage = "https://github.com/pycompression/python-isal"; + license = licenses.psfl; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/li/lib4sbom/package.nix b/pkgs/development/python-modules/lib4sbom/default.nix index c9c159f1b6ad3..0840b14c70b70 100644 --- a/pkgs/by-name/li/lib4sbom/package.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -1,9 +1,13 @@ { lib -, python3Packages +, buildPythonPackage , fetchFromGitHub +, pyyaml +, semantic-version +, defusedxml +, pytestCheckHook }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "lib4sbom"; version = "0.7.1"; format = "setuptools"; @@ -15,13 +19,13 @@ python3Packages.buildPythonPackage rec { hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = [ pyyaml semantic-version defusedxml ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index 7b01a5738bbb9..d7aa3bf51e03b 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-1J6FE6iID4U9cEcPPUK5CvCTmbgVWxI4AFLrx+gPGWg="; + hash = "sha256-x71+szDNDZNaVc8AMXruKvxSNXg561ibE2+kx53zHfI="; }; build-system = [ diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 62f5286747f0a..06fb3a3f02a9f 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-4cRElwF8AOvTLZJq1NF9Yqa7g44uiT96giyhqKZKp5M="; + hash = "sha256-Wfctu8rqj2HxPgXYMeL5Hovet8yjol7RfLH233Gl+v4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index a2af96582ca54..e88b9d585d2ed 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.3.31"; + version = "2024.4.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-Gg9KTsS7Np11jYBA8MgblQM6OmzOM/MPLsVZ6fUKT6g="; + hash = "sha256-UqpRkw6F8RAvchq0HBSfdHHO8Lgg+yLdBku+wsPKg0E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 32560c7baeef1..73e0a331799ad 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,17 +1,22 @@ -{ lib -, fetchPypi -, buildPythonPackage -, protobuf -, types-protobuf -, grpcio-tools -, pytestCheckHook -, pythonOlder +{ + buildPythonPackage, + fetchPypi, + grpcio-tools, + lib, + mypy-protobuf, + protobuf, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + testers, + types-protobuf, }: buildPythonPackage rec { pname = "mypy-protobuf"; version = "3.6.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,26 +25,35 @@ buildPythonPackage rec { hash = "sha256-AvJC6zQJ9miJ8rGjqlg1bsTZCc3Q+TEVYi6ecDZuyjw="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "protobuf" ]; + + build-system = [ setuptools ]; + + dependencies = [ + grpcio-tools protobuf types-protobuf - grpcio-tools ]; doCheck = false; # ModuleNotFoundError: No module named 'testproto' - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "mypy_protobuf" - ]; + pythonImportsCheck = [ "mypy_protobuf" ]; + + passthru.tests.version = testers.testVersion { + package = mypy-protobuf; + command = "${lib.getExe mypy-protobuf} --version"; + }; - meta = with lib; { + meta = { + changelog = "https://github.com/nipunn1313/mypy-protobuf/blob/v${version}/CHANGELOG.md"; description = "Generate mypy stub files from protobuf specs"; - homepage = "https://github.com/dropbox/mypy-protobuf"; - license = licenses.asl20; - maintainers = with maintainers; [ lnl7 ]; + homepage = "https://github.com/nipunn1313/mypy-protobuf"; + license = lib.licenses.asl20; + mainProgram = "protoc-gen-mypy"; + maintainers = with lib.maintainers; [ lnl7 ]; }; } diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index 66c07489dfaa0..8fa7ddd6e934d 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "2.0.0"; + version = "3.0.1"; format = "pyproject"; src = fetchPypi { pname = "myst_docutils"; inherit version; - hash = "sha256-WmmPEg+bINmeId+pjR6bbp8qzjfSXfEel+sQEdPIu8Y="; + hash = "sha256-alQvF0OWNjDck022ORJ1Nl4t1jgzMZKEbJxPHsrmBcI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index ee82753ae822e..389f0977677d3 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.14"; + version = "2.3.20"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9Tacr4mWmjXspKKCkFDWYeT7KkBh4/3f6UOkfj0/leg="; + hash = "sha256-tBrWdG8njNQzQ3kc0ATeu3ToP34gdmOBKj2jcB0X8+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 93b1d2b2e3bbf..50473f84651dc 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-Eqs/YkU2XrjD7x2WgvvR89/Pdi9AW9vhw3alJ8kIDgc="; + hash = "sha256-09SRSzA1RiBhJjq+dlln23myWvXFhr8krsPz7N80JKw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index b6ee36c3dce2f..2bfd6411631aa 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "parametrize-from-file"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "parametrize_from_file"; - hash = "sha256-FPTO2hYZT7bsQyPNcjBEk8SZKp51o/eMV5/U58W5SPI="; + hash = "sha256-t4WLNDkC/ErBnOGK6FoYIfjoL/zF9MxPThJtGM1nUL4="; }; # patch out coveralls since it doesn't provide us value diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index a13706dacb549..47fb42209dec2 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.9.0"; + version = "3.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-HdeShtslnvjmuiUb0W3ASnSWcZnyDJcthsIOjYmuD8I="; + hash = "sha256-gl0+mw0D0iGVmOc5jQP7b3EL1ZmT1lAr9ffx+XegdU0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index d839ad705ea77..a99abb74559d8 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.1"; + version = "3.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Gob2qBPPxAeIO/I7+9r4dBIxhvKnnZWD2nYcrMANM8U="; + hash = "sha256-F0bv9J2etrVF8wMU3caQ1ZA6TmQQOPTZWFjGsKOEPwo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 9f04970f9680d..82707a5d98d1e 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.5"; + version = "0.5.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-6K8rTfASpK7OvBwUy40X6xzgpfWL7lIJvpfRiGfBK6U="; + hash = "sha256-+OkfuIwbDx6SN5lawDJZYBrjHn9rsT/FT+GQ2MOAtg0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 15eb6342988fb..6d6830e42478b 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyphen"; - version = "0.14.0"; + version = "0.15.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WWyLO+HBpwQRul9lF9nM/jCDx1iuK5SkXycHNG2OZvo="; + hash = "sha256-pDBiPeysU9w2kSQSUyY8uja53XpE/9JoC3Bq82jNovI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index e3e96571b1e8b..2599fb1d813c3 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -20,14 +20,14 @@ let in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.13.4"; + version = "0.13.7"; format = "pyproject"; src = fetchFromGitHub { owner = "pyqtgraph"; repo = "pyqtgraph"; rev = "refs/tags/pyqtgraph-${version}"; - hash = "sha256-KVgsfvaVbR3eMRNqhJSBO4Hfk7KJgMdsZjKffx6vt84="; + hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 5fa9e60ae5c6c..3fd9d3c2fbd46 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildPythonPackage -, setuptools -, pkg-config -, swig -, pcsclite -, PCSC -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + PCSC, + pcsclite, + pkg-config, + pytestCheckHook, + setuptools, + stdenv, + swig, }: let @@ -16,8 +17,8 @@ let in buildPythonPackage rec { - version = "2.0.9"; pname = "pyscard"; + version = "2.0.9"; pyproject = true; src = fetchFromGitHub { @@ -27,40 +28,45 @@ buildPythonPackage rec { hash = "sha256-DO4Ea+mlrWPpOLI8Eki+03UnsOXEhN2PAl0+gdN5sTo="; }; - nativeBuildInputs = [ - setuptools - swig - ] ++ lib.optionals (!withApplePCSC) [ - pkg-config - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ swig ] ++ lib.optionals (!withApplePCSC) [ pkg-config ]; buildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = - if withApplePCSC then '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' else '' - substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; + if withApplePCSC then + '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' + else + '' + substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace smartcard/scard/winscarddll.c \ + --replace-fail "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; preCheck = '' # remove src module, so tests use the installed module instead rm -r smartcard ''; + disabledTests = [ + # AssertionError + "test_hresult" + "test_low_level" + ]; + meta = with lib; { - homepage = "https://pyscard.sourceforge.io/"; description = "Smartcard library for python"; - license = licenses.lgpl21; + homepage = "https://pyscard.sourceforge.io/"; + changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ layus ]; }; } diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index d369ace859f6b..50e4fe4a7d599 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.19"; + version = "3.3.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zm/ll6vOFW05euRgJN+SghVmMkSGQc9CVZkRu3h6AQQ="; + hash = "sha256-lJ3+wGzbgvaB20KOGg3ncKb2XlcraFMk8oEK6newX/A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index b73ae05a8cce4..4e1a0c1c41533 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "24.1.2"; + version = "24.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-NtGk+azpSZZm9PUf6Q1Qipo/zaUH+bed7k3oFnQyKjw="; + hash = "sha256-pQNm7Q9NAc/jLlR6f0132tpXyBoQaKpm7JoEgqOJL8U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 7452abb860c31..c866a5fc72d28 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xabbGnvzXNiE0koQVq9dmEib5Cv7kg1JjpZAyb7IZM0="; + hash = "sha256-LfWfBzJ3UyArcHxrIUDsIa8pIr1WkUikf6F6v+IVLG4="; }; # win_inet_pton is required for Windows support diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index b157eba228acd..98c0efd01d0a0 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -55,7 +55,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "5.9.0"; + version = "5.10.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-O3AJ7vBjuwRGa4AMwWIdxn5m2F45rLCjCHeff18b/5E="; + hash = "sha256-rfpGclSgCBTxlTgVqgNz3ixoldB9M+6mLmogkNDDdWs="; }; patches = [ diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index adb2fc81c9775..a15e31941ecc4 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.1"; + version = "21.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-s5C3f17VP5ooH78/4JQMkzuV1byi7rFPTmVr3lZliFc="; + hash = "sha256-BZrcYZxivrZIkHKqi+x9M4A9XE9dD//2PqzRwA3vuGU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 7689e40c5b8e8..ed4ac27bf63ac 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pytools"; - version = "2024.1.1"; + version = "2024.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LIjt+pkMjjJRZ8N2WfseEKPBEz3691K719hFZAK43P8="; + hash = "sha256-CBhx5FFQXEuYbrr6aK7qv9x76z+qG6pQ9yauviHh0Fc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index f7a50ce337fcd..a09e91fca0ce5 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.2.1"; + version = "2.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-H2gbVCvGKbeHZVlvz6SmKI8Gzw649DxcwYgfGcehsmg="; + hash = "sha256-5dz4NQZC0tKIYA9omRZAsSlvH5hpyCSmV0yvoRICcqg="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 14460fb9b17b0..23a3a87df727a 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.10.1"; + version = "0.10.2"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a0c72302d50d5dfa433ddab191672eec1dde1c6ed26330a378b720e5a3012e23"; + sha256 = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix index 5db47dfc65ea1..ef101fd2fccc2 100644 --- a/pkgs/development/python-modules/rich-rst/default.nix +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -1,31 +1,33 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, docutils -, rich +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + docutils, + rich, + pytestCheckHook, }: buildPythonPackage rec { pname = "rich-rst"; - version = "1.2.0"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "wasi-master"; - repo = pname; + repo = "rich-rst"; rev = "refs/tags/v${version}"; - hash = "sha256-jFPboZ5/T2I6EuyVM+45lrLWen8Kqf94gWXS1WDf1qU="; + hash = "sha256-A3SPbu1N5X55c32S8z8UPpmniJT+mdqfb1+zQEJMA5k="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ docutils rich ]; + dependencies = [ + docutils + rich + ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich_rst" ]; diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix index 298772e12cc76..dbbf8f7b29d6f 100644 --- a/pkgs/development/python-modules/riscv-config/default.nix +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.18.1"; + version = "3.18.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = "riscv-config"; rev = "refs/tags/${version}"; - hash = "sha256-lBjSHfnuNPi4Ks5ZCRLqJx3/l4GMmMEEIud8ZVl/S4Q="; + hash = "sha256-ADmf7EN3D+8isZRFx6WRMYq91YHunGavuwy3a3M3gCc="; }; pythonRelaxDeps = [ "pyyaml" ]; diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index aa49911009eb8..3ee1f89adf4ce 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.32.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,8 +40,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-rf"; repo = pname; - rev = "refs/tags/v.${version}"; - hash = "sha256-J7V4nQ8OxW4w75OyiMdUal8k5oXSn96g4w6k1+KV1Dw="; + rev = "refs/tags/v${version}"; + hash = "sha256-TtRj9pqm5153y78MzhlVpL1EvNiNJyjUH1aOlAWU0WE="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index 556f978c73124..de9f007af7ba9 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -5,13 +5,14 @@ , aiohttp , asn1 , python-dateutil +, setuptools , tenacity }: buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.5.3"; - format = "setuptools"; + version = "0.5.5"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -19,15 +20,19 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "refs/tags/v${version}"; - hash = "sha256-8htd5fLrtkaVlSEm+RB7tWA5YZkcAOjAXVNzZiMwP7k="; + hash = "sha256-dHWcYrBtmKdEIU45rMy4KvoPX88hnRpd4KBlbJaNvgI="; }; postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner" "" + --replace-fail "pytest-runner" "" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp asn1 python-dateutil diff --git a/pkgs/development/python-modules/smtpdfix/default.nix b/pkgs/development/python-modules/smtpdfix/default.nix index 5d34cd6693bff..3d541263c05ac 100644 --- a/pkgs/development/python-modules/smtpdfix/default.nix +++ b/pkgs/development/python-modules/smtpdfix/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "smtpdfix"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-882i0T6EySZ6jxOgoM11MU+ha41XfKjDDhUjeX7qvp4="; + hash = "sha256-5NGs6Q83EqGRJ+2IdOaXqGFIwfSNKy2wwHIJaOjj7JU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix index ffba0140becdb..f63ea26d5adf1 100644 --- a/pkgs/development/python-modules/solax/default.nix +++ b/pkgs/development/python-modules/solax/default.nix @@ -13,21 +13,21 @@ buildPythonPackage rec { pname = "solax"; - version = "3.0.5"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PQ7qJCNfXGNF2RK6pHwf0U1DXgv2j2uQ64Nv/qh8f8s="; + hash = "sha256-vc1NAbcQQxjpXnjZvTsnebzMc/LoMwBveDHBxBbhnEo="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout voluptuous diff --git a/pkgs/development/python-modules/starlette-wtf/default.nix b/pkgs/development/python-modules/starlette-wtf/default.nix index 3ca744a71f2f4..bacbbb0a1c59d 100644 --- a/pkgs/development/python-modules/starlette-wtf/default.nix +++ b/pkgs/development/python-modules/starlette-wtf/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "starlette-wtf"; - version = "0.4.3"; + version = "0.4.5"; format = "pyproject"; src = fetchFromGitHub { owner = "muicss"; repo = "starlette-wtf"; - rev = "v${version}"; - hash = "sha256-TSxcIgINRjQwiyhpGOEEpXJKcPlhFCxMQh4/GY1g1lw="; + rev = "refs/tags/${version}"; + hash = "sha256-88zU2NAsdty2OhHauwQ5+6LazuRDYPoqN9IIipI1t2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/strct/default.nix b/pkgs/development/python-modules/strct/default.nix index c5f9bc2f994b4..5148958b97899 100644 --- a/pkgs/development/python-modules/strct/default.nix +++ b/pkgs/development/python-modules/strct/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , setuptools , pytestCheckHook @@ -9,36 +8,26 @@ buildPythonPackage rec { pname = "strct"; - version = "0.0.32"; + version = "0.0.34"; pyproject = true; src = fetchFromGitHub { owner = "shaypal5"; repo = "strct"; rev = "v${version}"; - hash = "sha256-ctafvdfSOdp7tlCUYg7d5XTXR1qBcWvOVtGtNUnhYIw="; + hash = "sha256-uPM2U+emZUCGqEhIeTBmaOu8eSfK4arqvv9bItBWpUs="; }; - patches = [ - # https://github.com/shaypal5/strct/pull/4 - (fetchpatch { - name = "fix-versioneer-on-python312.patch"; - url = "https://github.com/shaypal5/strct/commit/a1e5b6ca9045b52efdfdbb3c82e12a01e251d41b.patch"; - hash = "sha256-xXADCSIhq1ARny2twzrhR1J8LkMFWFl6tmGxrM8RvkU="; - }) - ]; - postPatch = '' - substituteInPlace pytest.ini \ + substituteInPlace pyproject.toml \ --replace-fail \ - "--cov" \ - "#--cov" - - # configure correct version, which fails due to missing .git - substituteInPlace versioneer.py strct/_version.py \ - --replace-fail '"0+unknown"' '"${version}"' + '"--cov' \ + '#"--cov' ''; + # don't append .dev0 to version + env.RELEASING_PROCESS = "1"; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index fe31361a65be7..f13eef796b6f2 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "9.4.0"; + version = "9.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-D94cu/Re4Nd71/vYVhiG37bawPNuWp5T/cpKc4biPsw="; + hash = "sha256-zTg2lkGuYUDhzp7c1UAK7NsaELpwTmU6Lyp1UMuPJ34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix index c362e936eb32d..9f386dc2bc82b 100644 --- a/pkgs/development/python-modules/textdistance/default.nix +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "textdistance"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JYllgBse+FaGppq/bDzv3F2iHC+9iMkMaHJfV6fUXyE="; + hash = "sha256-AeH7z3uHHrj0GRHZT0YbC5nPgAM4TuDhw0ylwaerLtA="; }; # There aren't tests diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 687dadc3eb65e..24a48b3bdca9b 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -1,29 +1,29 @@ -{ lib -, buildPythonPackage -, fetchPypi -, types-html5lib +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + types-html5lib, }: buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240229"; - format = "setuptools"; + version = "4.12.0.20240504"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-435M+hGwOwF3VzLlbSwBDLJO4Qd4Yne65rwPo+MFtoY="; + hash = "sha256-17evTMxS/CJ4TTOlKWleNDKam91dtqZJybJcssOhSNU="; }; - propagatedBuildInputs = [ - types-html5lib - ]; + build-system = [ setuptools ]; + + dependencies = [ types-html5lib ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "bs4-stubs" - ]; + pythonImportsCheck = [ "bs4-stubs" ]; meta = with lib; { description = "Typing stubs for beautifulsoup4"; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 3b797ed297d70..a2de522334133 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.13.2"; + version = "0.13.4"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-6pR/tewHWstgIqqD8Jwj+AQutdhXU5aufm6RiEpXr9s="; + hash = "sha256-HAZVnyjbeHF6knipTxmmy/BI1wvoJ8c65PiMAIqgJ+0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index f92ef94177d5d..73f896e5541d5 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.5.6"; + version = "4.5.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-P1GiTsRDbJssoLZR//c+b4IJ2Zyb/0PaBLL+wmmI6zc="; + hash = "sha256-VIGcfAzU/0nrVqhny2Ix6rU0DkDhRvX9UkfK8k412QU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index ee93a2c6454de..a5af618cb8ffa 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "3.0.3"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; + hash = "sha256-sx07GKtrg5SzrbiyGEGtbUtrsZW5tkKVOHLburTCmyo="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 0400906ea8832..88b13859455dc 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-+FdQQzQhKhIOEnOym2DNT9uQL2uAbfE8tUXUHIFFK2I="; + hash = "sha256-+Sn+d6CuxIUEDLkDvcq7OT3AumElJFfWCwM02LPIeyg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 03413fc6f1fcf..c512dd55bc1f9 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.114"; + version = "0.0.115"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-FipD4VCz2/FYlf17+q7LTej9ZtT72/R4ELkAQtw7RvE="; + hash = "sha256-qqPBCLYS6yLpK8PzC3atQ73yi15XE3ywIUBVO7JPYVE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index d6d23f46611a4..0987ddfab2834 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { ''; pythonRelaxDeps = [ + "bellows" "universal-silabs-flasher" "zha-quirks" ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 0a32dea6649a1..3cc9a89e70b3f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.63.5"; + version = "0.64.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-iZxHXxheyoA5vo0Pxojs7QE8rSyTpsYpJ6/OzDSZJ20="; + hash = "sha256-4p/CUAZQLiADWzjXMOeYUX0OJgZczHrI2/sVRuXiFSI="; }; postPatch = '' @@ -72,10 +72,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # # Our two manual scans succeeded and the periodic one was attempted - # assert len(mock_scan.mock_calls) == 3 - # AssertionError: assert 4 == 3 - "test_periodic_scan_priority" + # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False + "test_quirks_v2" ]; disabledTestPaths = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0549ea253e372..f8d7aeee80af5 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1093,6 +1093,21 @@ let ]; }); + timeless = old.timeless.overrideAttrs (attrs: { + cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + src = attrs.src; + sourceRoot = "timeless/src/rust"; + hash = "sha256-n0/52CV3NzWe7T3N6VoaURMxWrnqeYaUMPKkUy+LRQs="; + }; + + cargoRoot = "src/rust"; + + nativeBuildInputs = attrs.nativeBuildInputs ++ [ + pkgs.rustPlatform.cargoSetupHook + pkgs.cargo + ]; + }); + stringi = old.stringi.overrideAttrs (attrs: { postInstall = let icuName = "icudt52l"; @@ -1179,6 +1194,11 @@ let patchPhase = "patchShebangs configure"; }); + rsgeo = old.rsgeo.overrideAttrs (attrs: { + nativeBuildInputs = [ pkgs.cargo ] ++ attrs.nativeBuildInputs; + postPatch = "patchShebangs configure"; + }); + exifr = old.exifr.overrideAttrs (attrs: { postPatch = '' for f in .onLoad .onAttach ; do @@ -1440,6 +1460,10 @@ let }); OpenMx = old.OpenMx.overrideAttrs (attrs: { + env = (attrs.env or { }) // { + # needed to avoid "log limit exceeded" on Hydra + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -Wno-ignored-attributes"; + }; preConfigure = '' patchShebangs configure ''; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 0f6cdeffe86ca..f49c1cdfcc895 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "6.4.0"; + version = "7.0.1"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-eUUPfMwCMrMHk2RcLfpI8VuolgI/7geY6/6QrWjkIXg="; + sha256 = "sha256-hcZwGJ409r3XKVScGfj0DonZdClDVvTcIZlmJ1Xd9Mw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1d0108049d764..bb9506dee19a0 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.74"; + version = "3.2.79"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-Ge0SCoZeBdEKGjvPXGzsYptKBzNWrUbjLEdNxsYUlcI="; + hash = "sha256-FQTRvi4HLfYavaLjfXrngnT/1nOGVXvedaUq7nG6ZAk="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/jacoco/default.nix b/pkgs/development/tools/analysis/jacoco/default.nix index 62835c61d0f30..6fa9c520186cd 100644 --- a/pkgs/development/tools/analysis/jacoco/default.nix +++ b/pkgs/development/tools/analysis/jacoco/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "jacoco"; - version = "0.8.11"; + version = "0.8.12"; src = fetchzip { url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip"; stripRoot = false; - sha256 = "sha256-Sd4Kh5ts0IdHhd9vF1XZzZ2KFRb+rsnzpam6Ysxu910="; + sha256 = "sha256-7bN68fcUycehJDJeBAyCloz8rb3SXgjwmC9zpob8YdI="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index dfaba8bc369ae..1c983d6bfd6dd 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1287.0"; + version = "1.1291.0"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-d5MafGgxtecBzAkFxx+vi1a4ZQiVDJaISld7mQlNGFE="; + hash = "sha256-m70XujX2KOTvObjeBtoAbrYddi/+pLDLPXf/o+/DtmU="; }; - npmDepsHash = "sha256-t+lYPVN/7mQak6A0VJUxnIj34iHB47nbcCV/dsO1/2E="; + npmDepsHash = "sha256-f7sY7eCF8k28UnGyKqOP/exhsZQzUC70nIIjEOXEeC4="; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/development/tools/analysis/tartan/default.nix b/pkgs/development/tools/analysis/tartan/default.nix index 1106d017cba19..f56a6260e7f10 100644 --- a/pkgs/development/tools/analysis/tartan/default.nix +++ b/pkgs/development/tools/analysis/tartan/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "tartan"; - version = "unstable-2021-12-23"; + version = "0.3.0-unstable-2021-12-23"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix deleted file mode 100644 index 89ee93b1c5d86..0000000000000 --- a/pkgs/development/tools/argc/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -}: - -rustPlatform.buildRustPackage rec { - pname = "argc"; - version = "1.14.0"; - - src = fetchFromGitHub { - owner = "sigoden"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Li/K5/SLG6JuoRJDz2DQoj1Oi9LQgZWHNvtZ1HVbj88="; - }; - - cargoHash = "sha256-D1T9FWTvwKtAYoqFlR2OmLRLGWhPJ9D8J7lq/QKcBoM="; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd argc \ - --bash <($out/bin/argc --argc-completions bash) \ - --fish <($out/bin/argc --argc-completions fish) \ - --zsh <($out/bin/argc --argc-completions zsh) - ''; - - meta = with lib; { - description = "A command-line options, arguments and sub-commands parser for bash"; - mainProgram = "argc"; - homepage = "https://github.com/sigoden/argc"; - changelog = "https://github.com/sigoden/argc/releases/tag/v${version}"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 850adc445bad2..26c03f7fa6584 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "benthos"; - version = "4.26.0"; + version = "4.27.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-xFh0dmiLkU/o14OCefARtvkdN4Z1hzMfamyyB/mhf9s="; + hash = "sha256-Jswy4Ku/dxIEfC+jNjLXu/WW24enc4Qn0vrOHvNDVYQ="; }; proxyVendor = true; - vendorHash = "sha256-Ce2vXPKbyj517N3uJEGc00hCVZhcRrPvXUSuK+jjK3U="; + vendorHash = "sha256-6CVDhy29bIn19EgKbKDNTBWdy+i18g0oz/NxABcQ6QE="; doCheck = false; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index a82c76af4af2c..e4b9f050d6f34 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-BrLDY3T40ndkjuWCx5kLZvMBp8xI5d3MFg9M3IpafWM="; + hash = "sha256-Kb5p838jezDTJnc2jcKnima1gE7ENMm+4cmN6F6vh+Y="; }; vendorHash = null; @@ -19,12 +19,12 @@ buildGoModule rec { doCheck = false; - meta = with lib; { + meta = { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; changelog = "https://github.com/moby/buildkit/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ vdemeester developer-guy ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ developer-guy vdemeester ]; mainProgram = "buildctl"; }; } diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 496d25ca3d2cd..f12baca266756 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.105.0"; + version = "1.106.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-b7pks3a2ApR32tc06HZ9hG2MoZKVoWwCBATtcV1+WBo="; + sha256 = "sha256-Un1qBQbrgdudAfnviP8d6A7nNwi1ZGAFPN33NLKXNwI="; }; meta = with lib; { diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 41b3f1022e065..b884428cf8b73 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -1,44 +1,11 @@ -{ callPackage }: +{ lib, callPackage }: let mkElectron = callPackage ./generic.nix { }; + infoJson = builtins.fromJSON (builtins.readFile ./info.json); in -rec { - electron-bin = electron_29-bin; - - electron_24-bin = mkElectron "24.8.6" { - armv7l-linux = "8f46901667a904a62df7043991f20dc1c2a00370a42159976855458562cda8fc"; - aarch64-linux = "599e78a3a8127828ea3fa444927e7e51035dba9811ce0d81d59ad9b0bd02b4f6"; - x86_64-linux = "61e87bbd361da101c6a8363cc9c1f8b8b51db61b076cf495d3f4424303265a96"; - x86_64-darwin = "067ce05d628b44e1393369c506268915081ac9d96c0973d367262c71dcd91078"; - aarch64-darwin = "d9093e6928b2247336b3f0811e4f66c4ae50a719ec9399c393ac9556c8e56cee"; - headers = "009p1ffh2cyn98fcmprrjzq79jysp7h565v4f54wvjxjsq2nkr97"; - }; - - electron_27-bin = mkElectron "27.3.11" { - armv7l-linux = "012127a3edf79e0e4623a08e853286e1cba512438a0414b1ab19b75d929c1cf2"; - aarch64-linux = "ddbfcd5e04450178ca4e3113f776893454822af6757761adc792692f7978e0df"; - x86_64-linux = "e3a6f55e54e7a623bba1a15016541248408eef5a19ab82a59d19c807aab14563"; - x86_64-darwin = "357e70a1c8848d4ac7655346bec98dd18a7c0cee82452a7edf76142017779049"; - aarch64-darwin = "a687b199fcb9890f43af90ac8a4d19dc7b15522394de89e42abd5f5c6b735804"; - headers = "0vrjdvqllfyz09sw2y078mds1di219hnmska8bw8ni7j35wxr2br"; - }; - - electron_28-bin = mkElectron "28.3.1" { - armv7l-linux = "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff"; - aarch64-linux = "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512"; - x86_64-linux = "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a"; - x86_64-darwin = "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66"; - aarch64-darwin = "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d"; - headers = "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr"; - }; - - electron_29-bin = mkElectron "29.3.0" { - armv7l-linux = "51a8b2d67ae58b01919d6eb9e8eef255cd4bb3475b3acaf58ed1b8dc2448f206"; - aarch64-linux = "bd74743eb03a77f40b65739b9ca751af264c6f428e16728d7e0332a4c94789a9"; - x86_64-linux = "7274fe2bbb2e3b71f8fc084921e22d10e529220d380a354827b274f9567261da"; - x86_64-darwin = "88873a315ddd2a70b82e83f2cb7495c0d9d7c7fb5c9ad14fcfee16af4ab89d5e"; - aarch64-darwin = "b3145bbd45007918c2365b1df59a35b4d0636222cd43eea4803580de36b9a17d"; - headers = "1smvjlgdp3ailmh0fvxj96p7cnvls19w7kdwn62v1s3xpl84b915"; - }; -} +lib.mapAttrs' (majorVersion: info: + lib.nameValuePair + "electron_${majorVersion}-bin" + (mkElectron info.version info.hashes) +) infoJson diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json new file mode 100644 index 0000000000000..f55e8236f0a21 --- /dev/null +++ b/pkgs/development/tools/electron/binary/info.json @@ -0,0 +1,57 @@ +{ + "24": { + "hashes": { + "aarch64-darwin": "d9093e6928b2247336b3f0811e4f66c4ae50a719ec9399c393ac9556c8e56cee", + "aarch64-linux": "599e78a3a8127828ea3fa444927e7e51035dba9811ce0d81d59ad9b0bd02b4f6", + "armv7l-linux": "8f46901667a904a62df7043991f20dc1c2a00370a42159976855458562cda8fc", + "headers": "009p1ffh2cyn98fcmprrjzq79jysp7h565v4f54wvjxjsq2nkr97", + "x86_64-darwin": "067ce05d628b44e1393369c506268915081ac9d96c0973d367262c71dcd91078", + "x86_64-linux": "61e87bbd361da101c6a8363cc9c1f8b8b51db61b076cf495d3f4424303265a96" + }, + "version": "24.8.6" + }, + "27": { + "hashes": { + "aarch64-darwin": "a687b199fcb9890f43af90ac8a4d19dc7b15522394de89e42abd5f5c6b735804", + "aarch64-linux": "ddbfcd5e04450178ca4e3113f776893454822af6757761adc792692f7978e0df", + "armv7l-linux": "012127a3edf79e0e4623a08e853286e1cba512438a0414b1ab19b75d929c1cf2", + "headers": "0vrjdvqllfyz09sw2y078mds1di219hnmska8bw8ni7j35wxr2br", + "x86_64-darwin": "357e70a1c8848d4ac7655346bec98dd18a7c0cee82452a7edf76142017779049", + "x86_64-linux": "e3a6f55e54e7a623bba1a15016541248408eef5a19ab82a59d19c807aab14563" + }, + "version": "27.3.11" + }, + "28": { + "hashes": { + "aarch64-darwin": "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d", + "aarch64-linux": "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512", + "armv7l-linux": "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff", + "headers": "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr", + "x86_64-darwin": "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66", + "x86_64-linux": "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a" + }, + "version": "28.3.1" + }, + "29": { + "hashes": { + "aarch64-darwin": "2d7997fe85296552ee50d57f78fde1aef462818c7b2a5bc0b92eaaf0be68432e", + "aarch64-linux": "d9bda129e01265dc0bcd7c6d255ddcf4b297fa12e797f9c9f2cb15a432be9056", + "armv7l-linux": "2b5f2d4f96469e4bf2a5dc433d37d6db088278147b2df01475a82584265718b0", + "headers": "0pdqbj3xxjirbr1chbn509h1q5c4d9q2221dn7di7jimpdh66zm8", + "x86_64-darwin": "0a5ccb3d3ca3a3bbdd4be4abf2c6aa45341a5e9f1a9fd17ab2c143be555897e5", + "x86_64-linux": "a346c9fd3b919f12288cb011aced0ead9abcfd8d47b9d8987b7f632c7cdc74de" + }, + "version": "29.3.2" + }, + "30": { + "hashes": { + "aarch64-darwin": "c1f086f394c0241341c638e70ce2e486238905a82b6422f9236f12fb4d6be8cc", + "aarch64-linux": "f4fb219b9bac50840f8b982983f4643d52bc147df1351ae0af60ed3da0c6c9d3", + "armv7l-linux": "b55a4335df7a45ef58a253da88b5998394d9cd7eddfc1a30786ffe496b84a399", + "headers": "0abaaxj3slp2z3nvfz9y98wxlp97vsn7r2h95fpwx2qv46c08r39", + "x86_64-darwin": "46379ec9aa24f4cd69e22b6d498455e0ee0b6d32c233028104833dfc35e52acf", + "x86_64-linux": "34c3085048fbe5855c10b512dd6acce01d13ec833d2374c401b3487e4ac35a17" + }, + "version": "30.0.2" + } +} diff --git a/pkgs/development/tools/electron/binary/print-hashes.sh b/pkgs/development/tools/electron/binary/print-hashes.sh deleted file mode 100755 index 37cd7d3c662ba..0000000000000 --- a/pkgs/development/tools/electron/binary/print-hashes.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -set -eu -o pipefail - -if [[ $# -lt 1 ]]; then - echo "$0: version" >&2 - exit 1 -fi - -VERSION="$1" - -declare -A SYSTEMS HASHES -SYSTEMS=( - [i686-linux]=linux-ia32 - [x86_64-linux]=linux-x64 - [armv7l-linux]=linux-armv7l - [aarch64-linux]=linux-arm64 - [x86_64-darwin]=darwin-x64 - [aarch64-darwin]=darwin-arm64 -) - -hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" | tail -n1)" -headers="$(nix-prefetch-url "https://artifacts.electronjs.org/headers/dist/v${VERSION}/node-v${VERSION}-headers.tar.gz")" - -# Entry similar to the following goes in default.nix: - -echo " electron_${VERSION%%.*}-bin = mkElectron \"${VERSION}\" {" - -for S in "${!SYSTEMS[@]}"; do - hash="$(grep " *electron-v${VERSION}-${SYSTEMS[$S]}.zip$" "$hashfile"|cut -f1 -d' ' || :)" - if [[ -n $hash ]]; then - echo " $S = \"$hash\";" - fi -done - -echo " headers = \"$headers\";" - -echo " };" diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 0cde63f2b3128..3ac10225bedfc 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -49,7 +49,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ lib.optional (lib.versionAtLeast info.version "29") + patches = base.patches ++ lib.optional (lib.versionAtLeast info.version "29" && lib.versionOlder info.version "30") (substituteAll { # disable a component that requires CIPD blobs name = "disable-screen-ai.patch"; diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 0304f0bbec437..361038040fdb0 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1,2631 +1,3257 @@ { - "28": { - "deps": { - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-Y0uNoq5LhlFMxQfqrTjzOokbB7Y6UUAlBCj+Nghiz5w=", - "owner": "electron", - "repo": "electron", - "rev": "v28.3.1" + "27": { + "chrome": "118.0.5993.159", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=", + "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", + "url": "https://gn.googlesource.com/gn", + "version": "2023-08-10" + } }, + "version": "118.0.5993.159" + }, + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", + "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-g0aRiWCPrXPKBsOsAgtLmRbOeYigtm05MrWH6/fhQs0=", - "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "120.0.6099.291", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DVO15xGxatRbUp13EoNslGEZ2QSHn97VbEBHyfMvKfQ=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "a429c26ae25c26a569ff12390d5f9be70c5e286b" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-QjCPRgFU34wZ8GG/dl+6wi2gflje3fG/x+eokb9W02c=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "2ca9f38714b1465b9f55b5fbd0da5e4342811e2b" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bQHo8CKDpqvJcVv6OzVO7LOGTqL9qHqD4n9TtRK0v5g=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "7686b5d38c69d14932abfb1c1a66ba56c78791ad" + "hash": "sha256-3yFHjd3LMXVbF4LX6Bi3yJF0CDVug0cDpGFbP8Ibvk4=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "118.0.5993.159", + "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { "fetcher": "fetchFromGitiles", "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" }, "src/chrome/test/data/perf/frame_rate/content": { "fetcher": "fetchFromGitiles", "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" }, "src/chrome/test/data/xr/webvr_info": { "fetcher": "fetchFromGitiles", "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+UawYfW5FAMpv0TbzSR8qITPGUQulLIZ0mUh6ZdnmMI=", - "url": "https://chromium.googlesource.com/website.git", - "rev": "07714da3c28b942dc8522affed4487403e971545" + "hash": "sha256-6/LSJGUVZuJe1WIBJEJO/dXZYnsby+X3EzeBbvWjUZU=", + "rev": "243c1406199960e001e1dceccafc6fc2db6897f9", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-DmDAKUUyiDASGGylDVQe2OkDVfiA1ficDG+oaMbKqdo=", + "owner": "electron", + "repo": "electron", + "rev": "v27.3.11" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-JXWGEsJrXRXs2BrkWIC8cUBD6uvt8ftb9V5Dy2yLc/w=", - "url": "https://quiche.googlesource.com/quiche.git", - "rev": "a01a131ca6df63e774809d623f47e8cf28c574cc" + "hash": "sha256-hB3gUqi/9SI9PGNkXNpli/TifI1kJEBScqRFIw7hm4c=", + "rev": "7d201495d8a5ef115787765fb12af0d5575281c1", + "url": "https://quiche.googlesource.com/quiche.git" }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aOV7kxrF8FeoHYodZjaUrDDUtpXg2gUiZg6Olv90puk=", - "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "6fff8ebc937f07e31473ac014a55f662248ab39a" + "hash": "sha256-It05E3+qG17dEbhbaX/VQJaydWOQ1mpsj95dT5IJkgo=", + "rev": "05f45adc147393562b518ca1f82a3ccba7ee40f7", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LWGll3KiMYndiLZBizhN+mzELjYpSxvtIctH+LO+20Q=", + "rev": "385ae8bed1f99e497cdf2f3a5640905b90e69292", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" }, "src/third_party/angle/third_party/glmark2/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" }, "src/third_party/angle/third_party/rapidjson/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+g1yjF1yETrL1X6Cxu5mhPWXukWygg1dnawU8S9cGkA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "7d738783bf286e82937e431c295d4682f3767267" + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2B0j9vNF8nMhmedk+ghz4JJJiDKN6jnVfdqsa4zRWeU=", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "47d423347823088a21b26262ca553eadb8e5b220" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "47107e384bd1dc25674acf04d000a8cdc6195234" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5srmcwL9Zqv91LwoBf9xuyusq1ghDo30Aj27Xo96yPc=", - "url": "https://dawn.googlesource.com/dawn.git", - "rev": "c7ed440d75861649d8a1ef4b775384f31211d902" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "62e175ef9fae75335575964c845a302447c012c7" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EAfTm0QZcihcU6ufBHE1QsYRggNWNKHjVZXcrUp/T+c=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "64030a4e01e27c608b6c5f1ab5add43575e086f9" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DqQIyZU6kYYRoouIiJnJBit8l38wPu08zbJhM2BQbs4=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "2ef3f322027bec1bb5572f5083d478148d355d79" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" + "hash": "sha256-TcNIocV0p53NJCudvy8wf+fIPIP2tnkoBf1F7mEBFLs=", + "rev": "8c8d20953d502db31fec2353b199e6c22ef0236e", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" }, - "src/third_party/google_benchmark/src": { + "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f" + "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", + "rev": "b902b346037ea3f4aadf8177021f6f917b16e648", + "url": "https://beto-core.googlesource.com/beto-core.git" }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-hxPNJzWS2f4iUsNYwRvxiTL9vRrcZzZT5KpIx3+WuGM=", - "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3" + "hash": "sha256-P0Aj2Puy6S1aRIHrAhmokiAmSmHfuWQR6UW/AbQFW+M=", + "rev": "85081c6b3c0b26129893c1bff6bfa42bc3ba2d2c", + "url": "https://boringssl.googlesource.com/boringssl.git" }, "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "8988364bcddd9b194b0bf931c10bc125987330ed" + "rev": "8988364bcddd9b194b0bf931c10bc125987330ed", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "src/third_party/cast_core/public/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd" + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", - "hash": "sha256-jueHC5YC+WmGRtGZ8yD6QT2pVj21n1THpIz/vI9M334=", - "url": "https://chromium.googlesource.com/catapult.git", - "rev": "47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4" + "hash": "sha256-AK85yVeCR3GKGtdW8G9Of+6UMJirJ9BNVyp9pffft7s=", + "rev": "f16ca3c78e46cefa982100444844da3fcb25390e", + "url": "https://chromium.googlesource.com/catapult.git" }, "src/third_party/ced/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", - "hash": "sha256-cRFzDmGoyrxwPDVvatGm3EutOXtWqqlI7v7BeX5d43s=", - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "cb7fe7e32de8b885ccdd6293444d8e4028b03eca" + "hash": "sha256-2lP3uGdqIZY3DpxGzfDhR2dW+o3Arduaeu56Au7h/5Q=", + "rev": "e0c145ca93c0439a65bcb1607e813edfbc97520b", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" }, "src/third_party/cld_3/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" }, "src/third_party/colorama/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "url": "https://chromium.googlesource.com/external/colorama.git", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49" + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-auHBX00DSvyMyhEsZGkpKh9KOO2RcaeP9PK6kmmMYls=", + "rev": "8d5118720805fdce0dd3ee2999c964501de4532c", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" }, "src/third_party/cpu_features/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "936b9ab5515dead115606559502e3864958f7f6e" + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" }, "src/third_party/cpuinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-BcSG/1aa/cyT8CCd1Qdsm/yXa5bCrmrtaRxnYjwkspY=", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "76d5e8f5b563daa65340a60fce0e9aec73a936df" + "hash": "sha256-oZjA2cMQMyhFcI+m6eOmdZ9A1oPAbyISeLxNyaoGivk=", + "rev": "c13d0bbb266d200a13532b5915d704c30d21081b", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" }, "src/third_party/crc32c/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s8pfcu5SkxXFCat76TJaDi1NTTQckZ1F+T8URCxOUdI=", + "rev": "bf7aaccb73b26c11e8bf21cb7d90314338e1743f", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wI4rx+oQ6i8yIB8NBp/O471O4pVJL3l+ez0t8I5oD/w=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "00c21541508ea2c6863f1cda24ef88ef30309ae8" + "hash": "sha256-wq7fJVNRSiyaADrCYB0TEmWQ//BJg4GYiHZNtMb1QlI=", + "rev": "81ac4449008dffea00e4e8f251f87fabc5abe0d3", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" }, "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", - "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1" + "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", + "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7iCJ1h51S/8pxQRMoDtGXzyuP6Dzxnc/1Cu4ALU8NYg=", + "rev": "deb3b674b26854204c8082ed93926207e42d3cf2", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u29t+pF7aRfhRmi36YyEPcQU7gIDqsjrf38+C0YIpFk=", + "rev": "50c4c887f1ccfa1a4bfb158b7dbc93058659ed01", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gbZpmcbqLisjLb6vnKKvHS6eRqjqvavvTRgxJsaE/RQ=", + "rev": "5dfa3b88f0863c3949f713804e0461c9cc34a030", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-WtosDcMOV9eh0PhTbB5w3x3AYQs3Ui4h3mV0Ib0CBlc=", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "9f3b33a275e7a5b19d8ce4aba7960d2a38858681" + "hash": "sha256-EXxlQGA7qwjuZ2Qg/rZinkllkdfCbKXz8c4JJEr4mtU=", + "rev": "7e251262409b3401809e57c5314dd158210355b8", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-B/2Qk5LSElBPNImlZHVF3A4g0GFE9OHG/+4QADpK+8w=", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "a6c7f00333881a7ecf7044b725052ab0c8776d6f" + "hash": "sha256-D3W8U19i5pHWPLviMKbpzhiDoF6A0+tClYJcZWdbTqk=", + "rev": "bcf0ed097be848d234fb5290c1e4d69672dc5405", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "src/third_party/dom_distiller_js/dist": { "fetcher": "fetchFromGitiles", "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mfS/l+V0If3fmXvA1p5gtyrNCU6IqWYrBbzm4jkXC3I=", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "aa6964bf3a34fd607837dd8123bc42465185c4f8" + "hash": "sha256-c/4bf5+sJEgsKOJ34wPDNm1+6QUzETZZr/nE4SG5nKA=", + "rev": "66e8f38891841bf88ee976a316c0c78a52f0cee5", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-SI4qIix+sXWIS3WJyJoTdPb1cmSIhpLAmfa9iX/5Jlg=", + "owner": "nodejs", + "repo": "node", + "rev": "v18.17.1" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" }, "src/third_party/farmhash/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", - "hash": "sha256-lomUDmbbYW95BHEuYmm0pVqf++nYEa2XxeW4ag36tgc=", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "e1ca3f06adec15150a171bc38f550058b4bbb23b" + "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", + "rev": "0ba37733400593b162e5ae9ff26b384cff49c250", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "src/third_party/flac": { "fetcher": "fetchFromGitiles", "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5" + "hash": "sha256-yibx1WMAwNajROMGVqox3naMU09RSayxUaTCJ860euo=", + "rev": "28861d1d7d5ec6ce34d4bbdc10bec4aace341167", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" }, "src/third_party/fontconfig/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", + "url": "https://chromium.googlesource.com/external/fontconfig.git" }, "src/third_party/fp16/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" }, - "src/third_party/grpc/src": { + "src/third_party/freetype-testing/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wyaCNPPL2CTZYY6YUUuGnN3TjHxgKeHAYsw+r88ijMI=", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "55d0287cfc31115760cb13caa346b407ef0c0ceb" + "hash": "sha256-RRieGqEeAk5AYzJqPRpF25FmxMpEYwR7AQWLzXkED50=", + "rev": "45903920b984540bb629bc89f4c010159c23a89a", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, - "src/third_party/freetype-testing/src": { + "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" + "hash": "sha256-tVtrSbLxnHrbh027cafNbqkfjq/afQxw57rW9yGsRe0=", + "rev": "25f44f341f701eccc29d22f69313a54363c6099b", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "src/third_party/fxdiv/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" }, - "src/third_party/harfbuzz-ng/src": { + "src/third_party/gemmlowp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-xCsfgbsWVSiuII5zFspssrqX4NrRuhzufYSq6fdnjKQ=", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "f26fd69d858642d76413b8f4068eaf9b57c40a5f" + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" }, - "src/third_party/emoji-segmenter/src": { + "src/third_party/google_benchmark/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" }, - "src/third_party/ots/src": { + "src/third_party/googletest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, - "src/third_party/libgav1/src": { + "src/third_party/grpc/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", - "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "df0023cc95b8e606a2fd243522d823401ef86637" + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, - "src/third_party/googletest/src": { + "src/third_party/harfbuzz-ng/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" + "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", + "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" }, "src/third_party/hunspell_dictionaries": { "fetcher": "fetchFromGitiles", "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" }, "src/third_party/leveldatabase/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" }, "src/third_party/libFuzzer/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wuB/lbkVCbisZvVFuLdE8XNDuiLQcI47/Y0EqvOCytc=", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "b5dbc33890d9586e4f6a213f1bf163ad287e6aa4" + "hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=", + "rev": "26cc39e59b2bf5cbc20486296248a842c536878d", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" }, "src/third_party/libaddressinput/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6oZWYXRTZ1IC5yGvfPI19PwPU9O7mKBsW2wVxBGwU/I=", - "url": "https://aomedia.googlesource.com/aom.git", - "rev": "1dbe1c7fae2456f91ccc79fecb919e9ffea0727a" + "hash": "sha256-Z8td6FIvHibTQsB6x/A/69xduogj2b2lteiQB6l56vE=", + "rev": "5f8db64abce68a3698fb732697ae50880bc9cac4", + "url": "https://aomedia.googlesource.com/aom.git" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Jd/KwJJ1oeQMLg8CShTTDQhCVHEDpXcQHiA4+NXYOIA=", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "1a78d970b8315e7cc6a8601861ec75189c50c214" + "hash": "sha256-KfRRGTS8kBwi9Z9wafpSwL29RU38THG2xBCvNBXtZtg=", + "rev": "b2d36b1c3bfc806694cd4ff0cb188270823fe6d8", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9PT/tuxjREGsvSnYT2wyaL5sB52CcYPpKVKN0ZGldWU=", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "629e7ba7c964a62c97f6a882bffaec3c8490bb1e" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", - "url": "https://beto-core.googlesource.com/beto-core.git", - "rev": "b902b346037ea3f4aadf8177021f6f917b16e648" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01" + "hash": "sha256-yTv1AGtWfxXcywZycpsQBkBRLwuUJMPFKtpj7nrsc4A=", + "rev": "707919b2f8ac1920b2f7ae252c233f9c6dcf84e1", + "url": "https://aomedia.googlesource.com/libavifinfo.git" }, - "src/third_party/ukey2/src": { + "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + "hash": "sha256-YP1LAUaV8epDAsd9LOovdXUyzpaLgffOJcGM6VmTaKc=", + "rev": "84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, - "src/third_party/cros-components/src": { + "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZjLMlNDDN08v9SUFAuroPsu/6ADLHZAAFpv+bmaJA2Y=", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "25159cae8d540780cbeb994692ce4a3ea14cc094" + "hash": "sha256-CBUw50T/jFMXU0cR+BQH6JyEY3mHamLM6kA8YdvI24Q=", + "rev": "331847d7a5e6f8706689cf5d468e6e58c868fa10", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "src/third_party/libdrm/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" }, - "src/third_party/expat/src": { + "src/third_party/libgav1/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", + "rev": "df0023cc95b8e606a2fd243522d823401ef86637", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" }, "src/third_party/libipp/libipp": { "fetcher": "fetchFromGitiles", "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" }, "src/third_party/libjpeg_turbo": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "9b894306ec3b28cea46e84c32b56773a98c483da" + "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", + "rev": "30bdb85e302ecfc52593636b2f44af438e05e784", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" }, "src/third_party/liblouis/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "url": "https://chromium.googlesource.com/external/liblouis-github.git", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" }, "src/third_party/libphonenumber/dist": { "fetcher": "fetchFromGitiles", "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" }, "src/third_party/libprotobuf-mutator/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" }, "src/third_party/libsrtp": { "fetcher": "fetchFromGitiles", "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" }, "src/third_party/libsync/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rqmY4JNm4zuYqXs7o+1QhNnaNX4Cmt7PTJMGploHPnY=", + "rev": "a321409e66c212098e755cfae1a978bbcff1ccbb", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-UA/pf35eWFArRM+QdN6i6LK0ePWzXEsviHlf3WUgMoM=", - "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "424723dc025ce451dab9568239a46b18d0919b4d" + "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", + "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f", + "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "src/third_party/libwebm/source": { "fetcher": "fetchFromGitiles", "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" }, "src/third_party/libwebp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", - "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760" + "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", + "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76", + "url": "https://chromium.googlesource.com/webm/libwebp.git" }, "src/third_party/libyuv": { "fetcher": "fetchFromGitiles", "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "src/third_party/lss": { "fetcher": "fetchFromGitiles", "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" }, "src/third_party/material_color_utilities/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", - "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1" + "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" }, "src/third_party/minigbm/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5" + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", + "owner": "nodejs", + "repo": "nan", + "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" }, "src/third_party/nasm": { "fetcher": "fetchFromGitiles", "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5d7c8WvkjmBuwcwqhxQf0wRE3qaF8fFsiqUE1sHh0nc=", + "rev": "8725391822b8901784b379a4573ab8828e7091d3", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" }, "src/third_party/neon_2_sse/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff" + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" }, "src/third_party/openh264/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", - "url": "https://chromium.googlesource.com/openscreen", - "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665", + "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-U1cScrfKN0F+cy307RT2iwB6RYKeCNDRnkYxzamezoY=", - "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "a3895af47f600e3f9677f31fa39e15bd01c18457" + "hash": "sha256-u+El2jEnvlcQs5j5TthpKj8s255n2AhJPW+Q/s0Ljm0=", + "rev": "6e55da0c45788fdc22fa3aab7ead414fc42b74c1", + "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", - "hash": "sha256-xLx+dnUysm+HS1esu2hAqBKg/GgTJK4SQu1ZINr2aYc=", - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "7ce535ddfc62d30166f35a8ed0f121da5eb0437c" + "hash": "sha256-/8WQO0r10Hz3yLNh1MtjE8rGfzbpDkUowA2OPwEuRvA=", + "rev": "43b72e3ce703b676c9c923b04540472d10790f56", + "url": "https://android.googlesource.com/platform/external/perfetto.git" }, "src/third_party/pthreadpool/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", - "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8" + "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", + "rev": "1787867f6183f056420e532eec640cba25efafea", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" }, "src/third_party/pyelftools": { "fetcher": "fetchFromGitiles", "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" }, "src/third_party/pywebsocket3/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" }, "src/third_party/re2/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-m3bJlSyyhmj/7jvy7ExNX/gol7yeu1mnmyAc8u8Pr8s=", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "3d9bdbd0e208d3274a1cb1275c94d8b7626ddde2" + "hash": "sha256-9V/Q5o24sL1TJUDNifUqpyrQ2zTSrhU0Bxo9qDwd0+4=", + "rev": "87d09ef4f0307e53f1d3796843f4b90d41cfccaa", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "src/third_party/ruy/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Zi3A49YqDE5S4iSpw9t9kTzitbQbcslm1zsepWX5cbw=", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "6ffa93a89376555b09134c59b84d8f5e9cfc6ce6" + "hash": "sha256-hNco0Jol4vQS1bkYiXaoZ1IPHwoRq3DD3iY0TeLygew=", + "rev": "c04e5e52ae6b144f74ac032652e3c538bda15c9b", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-CvoJxsBN1Nyh+RPgU+aptZW5WsfGB4hmSlhyma1wO+E=", - "url": "https://skia.googlesource.com/skia.git", - "rev": "349c1179c43ef46f2804404952b9460dc007d76a" + "hash": "sha256-Ck15ddYoo8pVLHcwW5P8Ei1sBQf23EGd/ySGOVSWAFQ=", + "rev": "b4f0c1163c955e42489f62d842585720cf0df0ea", + "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" }, "src/third_party/snappy/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", + "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wKsfwZpDRQzYQp6qls07uapgy9K3TWLOEUQlhIFpJtw=", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "cd9486849ba3c3ec753f556fd29c0aabee122a28" + "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", + "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Im4sdDo4b96YQIKDcAmqUk8PiJzejZgSDPur3hqPPRk=", - "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "d9ec9befba05a8dfca09c1e88f3f7be0e4b153c6" + "hash": "sha256-PCPb5opTATGCCQmw8TGF09TbLL8QES+So+yaL68H//I=", + "rev": "32f9332d1d7aacbdba7c1aa5df894bb1890bb2cc", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" }, "src/third_party/text-fragments-polyfill/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-119/isDtopnj6MBRr3bzBvIppXw8M/ejcPx0CmIjXZU=", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "21e56c30e480ac67bed48335a5d122c59a6a6805" + "hash": "sha256-3gawK1S5+nr5yOAHgYozLWSoT1TbJmB6Md1fID6du9w=", + "rev": "91946956f81a2d9fd12a6d6baba20c997d3f8890", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-lqCUx70IeHZ7YfE9DXia7dFok/JsFu/HSIv2AGi37YI=", - "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "2b783ed328d3a46e6a7a21218ced6b4dd1684114" + "hash": "sha256-xYX77wsgG+2TzS0AinFJndnID5P3/anY4TPh3cjRaIY=", + "rev": "4b7a5f2a3522cbc4e4334cdc64bfaf3f832b89c3", + "url": "https://chromium.googlesource.com/vulkan-deps" }, "src/third_party/vulkan-deps/glslang/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+Qs+Q3p11y9oUKyWEbuaQ0vx6hppFZSFbFuU0ve6rRo=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "ebb0a8b28e5ea7a13146a24b3ad87b1966dbdfa3" + "hash": "sha256-Y9AmEtFPj+sp/a5YnHChqlqgW/1kdaJ1CEbBB5r2cuI=", + "rev": "e3a711b6fc942307be7cb634698015dfd13c37fe", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" }, "src/third_party/vulkan-deps/spirv-cross/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "2de1265fca722929785d9acdec4ab728c47a0254" + "hash": "sha256-I8RXVat6//rlpmZuuC99Ar/Rct6MFce4FGKgQA2gBj0=", + "rev": "54997fb4bc3adeb47b9b9f7bb67f1c25eaca2204", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" }, "src/third_party/vulkan-deps/spirv-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-JLFVzFNdXqxyKmg3NymIqqZmf2GAb7tYetQ6HJPsUIQ=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "88bc5e321c2839707df8b1ab534e243e00744177" + "hash": "sha256-OqLxyrTzg1Q2zmQd0YalWtl7vX5lRJFmE2VH7fHC8/8=", + "rev": "d790ced752b5bfc06b6988baadef6eb2d16bdf96", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" }, "src/third_party/vulkan-deps/spirv-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+HUDsp0COKlPtKidOVvUk7lN1AiFw01i5ANc3MO+qjs=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "5084f58e5d187b16f84d2af936ff94ea2f46a00c" + "hash": "sha256-wFdAzbOQdOqeuVaWl5036qkli1gkSiL5JHH82Z5cFL4=", + "rev": "4c16c35b16bbd462a0e89707ebeecc0bce956b2f", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" }, "src/third_party/vulkan-deps/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-UlaNc1NxTYulrF4Ol0rLysbLwbFR46Evq7WkWncPB8k=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "f4bfcd885214675a6a0d7d4df07f52b511e6ea16" + "hash": "sha256-9+tHkkHsP5ft6+tbofOYV1yBFDpFlJz4Q6YS8c6T5As=", + "rev": "2634c969d7dc0e983f005f7f2e665cce8449efe6", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" }, "src/third_party/vulkan-deps/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GbVr8LmwC6r7a13++5cYJXAq+H4P07quEHpTUV1qfqA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "7b7d15bc9f1d782e4d6ea34e61fd9a36a7952208" + "hash": "sha256-q7/dYKQ3O0aSs326YbEeLlS+SciFWugBGm/G+b8RNd0=", + "rev": "d34bfafff23602e857064bea6d99a35eb63f37f2", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" }, "src/third_party/vulkan-deps/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-vnrhYM7tcDTcXH4A+2leio5Wc1+b5H+7CQISEI+SPV8=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "f7017f23337b90a2b2ceb65a4e1050e8ad89e065" + "hash": "sha256-tcaJmosHwTo38keV5qkumkLB1o1qq8v2ZmSsi2zDGoE=", + "rev": "389110e4600669d82bca042859fddf898387c0d2", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" }, "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-buxOdupK/w1sFGGHrEI+On2/mR0q5whvQNKUI8dxJ60=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "dcfce25b439a2785f2c90b184e1964898070b4f1" + "hash": "sha256-7M47ZCbNwIppaotMfJTFTRsYNvSZNc0FUufoyXyUu/g=", + "rev": "dd26ae7065a9ed60c8ab517ed79bf7935394aec7", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" }, "src/third_party/vulkan-deps/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-LJd7pkcFd8k4npEv8mJy+47xo/5CXMN75ZAtDp+v6FI=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "281e1c1c6b51bb6b33f88c18ed4da58ac3024311" + "hash": "sha256-lj6MIQctcK6gsJlLdLwQ9PHbiAtTbNIPinii8vGZdGk=", + "rev": "b89f48ae89ec064c91e8b77468cebc18c3faa682", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" }, "src/third_party/vulkan_memory_allocator": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0ICSMZhnsLqMNfqSGjqM3p4ssxptkBtt7EMCpxknW4A=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "3fda2fbf51db54398c0155facee82cc9533958a2" + "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", + "rev": "e87036508bb156f9986ea959323de1869e328f58", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" }, - "src/third_party/wayland-protocols/src": { + "src/third_party/wayland-protocols/gtk": { "fetcher": "fetchFromGitiles", - "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", - "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" }, "src/third_party/wayland-protocols/kde": { "fetcher": "fetchFromGitiles", "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" }, - "src/third_party/wayland-protocols/gtk": { + "src/third_party/wayland-protocols/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=", + "rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" }, "src/third_party/webdriver/pylib": { "fetcher": "fetchFromGitiles", "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" }, "src/third_party/webgl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed" + "hash": "sha256-h4by/1pp9oQGetZNnc1Rt5X5izgQf8ZUZDfsxQacqC0=", + "rev": "eab0468fc0405b21e59bea30a441d8e38c9db2b7", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-E39f0wy72TwQ9IM4QquqWxwDiHZOUI8hWkx2QDFcRog=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "3dbe4ce12983ccc1ad42e228057c7d8adc17cb78" + "hash": "sha256-Wch3opAvU/6rJVptOKxOJssev8NhNpbYZddScTlzuMw=", + "rev": "4c8d2f67ecd03fbd3cb4c517ef8461427b6d635d", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ju7sX1jrzg5BZOqdkcnFymRTqdFi7xkeHznKJQB1+08=", - "url": "https://webrtc.googlesource.com/src.git", - "rev": "5ab829e4ca8f63be6b4ed1d98eee382d7307d34e" + "hash": "sha256-KpiNGAue945kGCuQYGhxiWVUFTE1tcntSAXBZdkrE9A=", + "rev": "d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d", + "url": "https://webrtc.googlesource.com/src.git" }, - "src/third_party/wuffs/src": { + "src/third_party/weston/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" + "hash": "sha256-sfJm1CBGXX13pFcqeOVPqWlXrUfwjRl+rYf2BoT8Bt8=", + "rev": "775f8a1edf357f59e6b2e284297f396f4fac95a4", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" }, - "src/third_party/weston/src": { + "src/third_party/wuffs/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7" + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" }, "src/third_party/xdg-utils": { "fetcher": "fetchFromGitiles", - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44" + "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-s9Avx9o+1igKulOpKhtbbkoINuh1wNercPszRaA4TZM=", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "bbbaa7352a3ea729987d3e654d37be93e8009691" + "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", + "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" }, - "src/tools/page_cycler/acid3": { + "src/third_party/zstd/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" + "hash": "sha256-yzv/R/GnqlXLeAjBEIev+8uM7MC0HeK0MfppnMTJ7Eg=", + "rev": "25822342be59d831bad65426ae51f5cc22157b09", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" }, - "src/third_party/zstd/src": { + "src/tools/page_cycler/acid3": { "fetcher": "fetchFromGitiles", - "hash": "sha256-95OOpYKGve+YWzqqguQIg1emTOAuaGyYpWxrWVDOKAQ=", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "cdceb0fce59785c841bf697e00067163106064e1" + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GevDXfVX4UxwTbgp2ZQbp3AFOHv5tECmyqLGIyYi5Tw=", - "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "71b6b5a68e0883c155e01368aace6eb6d71b85f3" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", - "owner": "nodejs", - "repo": "nan", - "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" - }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-yvMU6dXRzHP7l6axo3g4svJ1H2edtFvX2MVMm3K1bEc=", - "owner": "nodejs", - "repo": "node", - "rev": "v18.18.2" - }, - "src/third_party/squirrel.mac": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + "hash": "sha256-Fn4HoS7O2J3nGXFyq7r7AheRQzKy80USTQnNnC4rWqM=", + "rev": "36e4828ab658b8ad72f80974883c4c94f6e7012c", + "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "version": "28.3.1", - "modules": "119", + "electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964", + "modules": "118", + "node": "18.17.1", + "version": "27.3.11" + }, + "28": { "chrome": "120.0.6099.291", - "node": "18.18.2", "chromium": { - "version": "120.0.6099.291", "deps": { "gn": { - "version": "2023-10-23", - "url": "https://gn.googlesource.com/gn", + "hash": "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=", "rev": "e4702d7409069c4f12d45ea7b7f0890717ca3f4b", - "hash": "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=" + "url": "https://gn.googlesource.com/gn", + "version": "2023-10-23" } - } + }, + "version": "120.0.6099.291" }, "chromium_npm_hash": "sha256-zexxXAAJDnhMmh7HfBO1V1z1Yds06C3gSpXacsbjUb4=", - "electron_yarn_hash": "117vxam1044yy2akwjfhvb5dpfnv667pwbg92ac43551xfn0slcg" - }, - "27": { "deps": { - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-DmDAKUUyiDASGGylDVQe2OkDVfiA1ficDG+oaMbKqdo=", - "owner": "electron", - "repo": "electron", - "rev": "v27.3.11" - }, "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-3yFHjd3LMXVbF4LX6Bi3yJF0CDVug0cDpGFbP8Ibvk4=", - "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "118.0.5993.159", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YP1LAUaV8epDAsd9LOovdXUyzpaLgffOJcGM6VmTaKc=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-CBUw50T/jFMXU0cR+BQH6JyEY3mHamLM6kA8YdvI24Q=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "331847d7a5e6f8706689cf5d468e6e58c868fa10" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-rqmY4JNm4zuYqXs7o+1QhNnaNX4Cmt7PTJMGploHPnY=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "a321409e66c212098e755cfae1a978bbcff1ccbb" + "hash": "sha256-g0aRiWCPrXPKBsOsAgtLmRbOeYigtm05MrWH6/fhQs0=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "120.0.6099.291", + "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { "fetcher": "fetchFromGitiles", "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" }, "src/chrome/test/data/perf/frame_rate/content": { "fetcher": "fetchFromGitiles", "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" }, "src/chrome/test/data/xr/webvr_info": { "fetcher": "fetchFromGitiles", "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6/LSJGUVZuJe1WIBJEJO/dXZYnsby+X3EzeBbvWjUZU=", - "url": "https://chromium.googlesource.com/website.git", - "rev": "243c1406199960e001e1dceccafc6fc2db6897f9" + "hash": "sha256-+UawYfW5FAMpv0TbzSR8qITPGUQulLIZ0mUh6ZdnmMI=", + "rev": "07714da3c28b942dc8522affed4487403e971545", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-Y0uNoq5LhlFMxQfqrTjzOokbB7Y6UUAlBCj+Nghiz5w=", + "owner": "electron", + "repo": "electron", + "rev": "v28.3.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-hB3gUqi/9SI9PGNkXNpli/TifI1kJEBScqRFIw7hm4c=", - "url": "https://quiche.googlesource.com/quiche.git", - "rev": "7d201495d8a5ef115787765fb12af0d5575281c1" + "hash": "sha256-JXWGEsJrXRXs2BrkWIC8cUBD6uvt8ftb9V5Dy2yLc/w=", + "rev": "a01a131ca6df63e774809d623f47e8cf28c574cc", + "url": "https://quiche.googlesource.com/quiche.git" }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-It05E3+qG17dEbhbaX/VQJaydWOQ1mpsj95dT5IJkgo=", - "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "05f45adc147393562b518ca1f82a3ccba7ee40f7" + "hash": "sha256-aOV7kxrF8FeoHYodZjaUrDDUtpXg2gUiZg6Olv90puk=", + "rev": "6fff8ebc937f07e31473ac014a55f662248ab39a", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+g1yjF1yETrL1X6Cxu5mhPWXukWygg1dnawU8S9cGkA=", + "rev": "7d738783bf286e82937e431c295d4682f3767267", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" }, "src/third_party/angle/third_party/glmark2/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" }, "src/third_party/angle/third_party/rapidjson/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LWGll3KiMYndiLZBizhN+mzELjYpSxvtIctH+LO+20Q=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "385ae8bed1f99e497cdf2f3a5640905b90e69292" + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-TcNIocV0p53NJCudvy8wf+fIPIP2tnkoBf1F7mEBFLs=", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "8c8d20953d502db31fec2353b199e6c22ef0236e" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-auHBX00DSvyMyhEsZGkpKh9KOO2RcaeP9PK6kmmMYls=", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", - "rev": "8d5118720805fdce0dd3ee2999c964501de4532c" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7iCJ1h51S/8pxQRMoDtGXzyuP6Dzxnc/1Cu4ALU8NYg=", - "url": "https://dawn.googlesource.com/dawn.git", - "rev": "deb3b674b26854204c8082ed93926207e42d3cf2" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "62e175ef9fae75335575964c845a302447c012c7" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u29t+pF7aRfhRmi36YyEPcQU7gIDqsjrf38+C0YIpFk=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "50c4c887f1ccfa1a4bfb158b7dbc93058659ed01" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gbZpmcbqLisjLb6vnKKvHS6eRqjqvavvTRgxJsaE/RQ=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "5dfa3b88f0863c3949f713804e0461c9cc34a030" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" + "hash": "sha256-2B0j9vNF8nMhmedk+ghz4JJJiDKN6jnVfdqsa4zRWeU=", + "rev": "47d423347823088a21b26262ca553eadb8e5b220", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" }, - "src/third_party/google_benchmark/src": { + "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f" + "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", + "rev": "b902b346037ea3f4aadf8177021f6f917b16e648", + "url": "https://beto-core.googlesource.com/beto-core.git" }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-P0Aj2Puy6S1aRIHrAhmokiAmSmHfuWQR6UW/AbQFW+M=", - "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "85081c6b3c0b26129893c1bff6bfa42bc3ba2d2c" + "hash": "sha256-hxPNJzWS2f4iUsNYwRvxiTL9vRrcZzZT5KpIx3+WuGM=", + "rev": "c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3", + "url": "https://boringssl.googlesource.com/boringssl.git" }, "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "8988364bcddd9b194b0bf931c10bc125987330ed" + "rev": "8988364bcddd9b194b0bf931c10bc125987330ed", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "src/third_party/cast_core/public/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd" + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", - "hash": "sha256-AK85yVeCR3GKGtdW8G9Of+6UMJirJ9BNVyp9pffft7s=", - "url": "https://chromium.googlesource.com/catapult.git", - "rev": "f16ca3c78e46cefa982100444844da3fcb25390e" + "hash": "sha256-jueHC5YC+WmGRtGZ8yD6QT2pVj21n1THpIz/vI9M334=", + "rev": "47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4", + "url": "https://chromium.googlesource.com/catapult.git" }, "src/third_party/ced/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2lP3uGdqIZY3DpxGzfDhR2dW+o3Arduaeu56Au7h/5Q=", - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "e0c145ca93c0439a65bcb1607e813edfbc97520b" + "hash": "sha256-cRFzDmGoyrxwPDVvatGm3EutOXtWqqlI7v7BeX5d43s=", + "rev": "cb7fe7e32de8b885ccdd6293444d8e4028b03eca", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" }, "src/third_party/cld_3/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" }, "src/third_party/colorama/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "url": "https://chromium.googlesource.com/external/colorama.git", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49" + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" }, "src/third_party/cpu_features/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "936b9ab5515dead115606559502e3864958f7f6e" + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" }, "src/third_party/cpuinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oZjA2cMQMyhFcI+m6eOmdZ9A1oPAbyISeLxNyaoGivk=", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "c13d0bbb266d200a13532b5915d704c30d21081b" + "hash": "sha256-BcSG/1aa/cyT8CCd1Qdsm/yXa5bCrmrtaRxnYjwkspY=", + "rev": "76d5e8f5b563daa65340a60fce0e9aec73a936df", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" }, "src/third_party/crc32c/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZjLMlNDDN08v9SUFAuroPsu/6ADLHZAAFpv+bmaJA2Y=", + "rev": "25159cae8d540780cbeb994692ce4a3ea14cc094", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wq7fJVNRSiyaADrCYB0TEmWQ//BJg4GYiHZNtMb1QlI=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "81ac4449008dffea00e4e8f251f87fabc5abe0d3" + "hash": "sha256-wI4rx+oQ6i8yIB8NBp/O471O4pVJL3l+ez0t8I5oD/w=", + "rev": "00c21541508ea2c6863f1cda24ef88ef30309ae8", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" }, "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", - "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1" + "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", + "rev": "47107e384bd1dc25674acf04d000a8cdc6195234", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5srmcwL9Zqv91LwoBf9xuyusq1ghDo30Aj27Xo96yPc=", + "rev": "c7ed440d75861649d8a1ef4b775384f31211d902", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EAfTm0QZcihcU6ufBHE1QsYRggNWNKHjVZXcrUp/T+c=", + "rev": "64030a4e01e27c608b6c5f1ab5add43575e086f9", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DqQIyZU6kYYRoouIiJnJBit8l38wPu08zbJhM2BQbs4=", + "rev": "2ef3f322027bec1bb5572f5083d478148d355d79", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-EXxlQGA7qwjuZ2Qg/rZinkllkdfCbKXz8c4JJEr4mtU=", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "7e251262409b3401809e57c5314dd158210355b8" + "hash": "sha256-WtosDcMOV9eh0PhTbB5w3x3AYQs3Ui4h3mV0Ib0CBlc=", + "rev": "9f3b33a275e7a5b19d8ce4aba7960d2a38858681", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-D3W8U19i5pHWPLviMKbpzhiDoF6A0+tClYJcZWdbTqk=", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "bcf0ed097be848d234fb5290c1e4d69672dc5405" + "hash": "sha256-B/2Qk5LSElBPNImlZHVF3A4g0GFE9OHG/+4QADpK+8w=", + "rev": "a6c7f00333881a7ecf7044b725052ab0c8776d6f", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "src/third_party/dom_distiller_js/dist": { "fetcher": "fetchFromGitiles", "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-c/4bf5+sJEgsKOJ34wPDNm1+6QUzETZZr/nE4SG5nKA=", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "66e8f38891841bf88ee976a316c0c78a52f0cee5" + "hash": "sha256-mfS/l+V0If3fmXvA1p5gtyrNCU6IqWYrBbzm4jkXC3I=", + "rev": "aa6964bf3a34fd607837dd8123bc42465185c4f8", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-yvMU6dXRzHP7l6axo3g4svJ1H2edtFvX2MVMm3K1bEc=", + "owner": "nodejs", + "repo": "node", + "rev": "v18.18.2" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" }, "src/third_party/farmhash/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "0ba37733400593b162e5ae9ff26b384cff49c250" + "hash": "sha256-lomUDmbbYW95BHEuYmm0pVqf++nYEa2XxeW4ag36tgc=", + "rev": "e1ca3f06adec15150a171bc38f550058b4bbb23b", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "src/third_party/flac": { "fetcher": "fetchFromGitiles", "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yibx1WMAwNajROMGVqox3naMU09RSayxUaTCJ860euo=", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "28861d1d7d5ec6ce34d4bbdc10bec4aace341167" + "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" }, "src/third_party/fontconfig/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", + "url": "https://chromium.googlesource.com/external/fontconfig.git" }, "src/third_party/fp16/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" - }, - "src/third_party/grpc/src": { + "src/third_party/freetype-testing/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-RRieGqEeAk5AYzJqPRpF25FmxMpEYwR7AQWLzXkED50=", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "45903920b984540bb629bc89f4c010159c23a89a" + "hash": "sha256-wyaCNPPL2CTZYY6YUUuGnN3TjHxgKeHAYsw+r88ijMI=", + "rev": "55d0287cfc31115760cb13caa346b407ef0c0ceb", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, - "src/third_party/freetype-testing/src": { + "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" + "hash": "sha256-wuB/lbkVCbisZvVFuLdE8XNDuiLQcI47/Y0EqvOCytc=", + "rev": "b5dbc33890d9586e4f6a213f1bf163ad287e6aa4", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "src/third_party/fxdiv/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" }, - "src/third_party/harfbuzz-ng/src": { + "src/third_party/gemmlowp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432" + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" }, - "src/third_party/emoji-segmenter/src": { + "src/third_party/google_benchmark/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" }, - "src/third_party/ots/src": { + "src/third_party/googletest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, - "src/third_party/libgav1/src": { + "src/third_party/grpc/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", - "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "df0023cc95b8e606a2fd243522d823401ef86637" + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, - "src/third_party/googletest/src": { + "src/third_party/harfbuzz-ng/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" + "hash": "sha256-xCsfgbsWVSiuII5zFspssrqX4NrRuhzufYSq6fdnjKQ=", + "rev": "f26fd69d858642d76413b8f4068eaf9b57c40a5f", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" }, "src/third_party/hunspell_dictionaries": { "fetcher": "fetchFromGitiles", "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" }, "src/third_party/leveldatabase/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" }, "src/third_party/libFuzzer/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "26cc39e59b2bf5cbc20486296248a842c536878d" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-tVtrSbLxnHrbh027cafNbqkfjq/afQxw57rW9yGsRe0=", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "25f44f341f701eccc29d22f69313a54363c6099b" + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" }, "src/third_party/libaddressinput/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Z8td6FIvHibTQsB6x/A/69xduogj2b2lteiQB6l56vE=", - "url": "https://aomedia.googlesource.com/aom.git", - "rev": "5f8db64abce68a3698fb732697ae50880bc9cac4" + "hash": "sha256-6oZWYXRTZ1IC5yGvfPI19PwPU9O7mKBsW2wVxBGwU/I=", + "rev": "1dbe1c7fae2456f91ccc79fecb919e9ffea0727a", + "url": "https://aomedia.googlesource.com/aom.git" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-KfRRGTS8kBwi9Z9wafpSwL29RU38THG2xBCvNBXtZtg=", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "b2d36b1c3bfc806694cd4ff0cb188270823fe6d8" + "hash": "sha256-Jd/KwJJ1oeQMLg8CShTTDQhCVHEDpXcQHiA4+NXYOIA=", + "rev": "1a78d970b8315e7cc6a8601861ec75189c50c214", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yTv1AGtWfxXcywZycpsQBkBRLwuUJMPFKtpj7nrsc4A=", - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "707919b2f8ac1920b2f7ae252c233f9c6dcf84e1" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5d7c8WvkjmBuwcwqhxQf0wRE3qaF8fFsiqUE1sHh0nc=", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "8725391822b8901784b379a4573ab8828e7091d3" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", - "url": "https://beto-core.googlesource.com/beto-core.git", - "rev": "b902b346037ea3f4aadf8177021f6f917b16e648" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01" + "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "url": "https://aomedia.googlesource.com/libavifinfo.git" }, - "src/third_party/ukey2/src": { + "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + "hash": "sha256-DVO15xGxatRbUp13EoNslGEZ2QSHn97VbEBHyfMvKfQ=", + "rev": "a429c26ae25c26a569ff12390d5f9be70c5e286b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, - "src/third_party/cros-components/src": { + "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-s8pfcu5SkxXFCat76TJaDi1NTTQckZ1F+T8URCxOUdI=", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "bf7aaccb73b26c11e8bf21cb7d90314338e1743f" + "hash": "sha256-QjCPRgFU34wZ8GG/dl+6wi2gflje3fG/x+eokb9W02c=", + "rev": "2ca9f38714b1465b9f55b5fbd0da5e4342811e2b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "src/third_party/libdrm/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" }, - "src/third_party/expat/src": { + "src/third_party/libgav1/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", + "rev": "df0023cc95b8e606a2fd243522d823401ef86637", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" }, "src/third_party/libipp/libipp": { "fetcher": "fetchFromGitiles", "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" }, "src/third_party/libjpeg_turbo": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "30bdb85e302ecfc52593636b2f44af438e05e784" + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" }, "src/third_party/liblouis/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "url": "https://chromium.googlesource.com/external/liblouis-github.git", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" }, "src/third_party/libphonenumber/dist": { "fetcher": "fetchFromGitiles", "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" }, "src/third_party/libprotobuf-mutator/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" }, "src/third_party/libsrtp": { "fetcher": "fetchFromGitiles", "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" }, "src/third_party/libsync/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bQHo8CKDpqvJcVv6OzVO7LOGTqL9qHqD4n9TtRK0v5g=", + "rev": "7686b5d38c69d14932abfb1c1a66ba56c78791ad", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", - "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f" + "hash": "sha256-UA/pf35eWFArRM+QdN6i6LK0ePWzXEsviHlf3WUgMoM=", + "rev": "424723dc025ce451dab9568239a46b18d0919b4d", + "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "src/third_party/libwebm/source": { "fetcher": "fetchFromGitiles", "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" }, "src/third_party/libwebp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", - "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76" + "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", + "url": "https://chromium.googlesource.com/webm/libwebp.git" }, "src/third_party/libyuv": { "fetcher": "fetchFromGitiles", "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "src/third_party/lss": { "fetcher": "fetchFromGitiles", "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" }, "src/third_party/material_color_utilities/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", - "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1" + "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" }, "src/third_party/minigbm/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5" + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" }, "src/third_party/nasm": { "fetcher": "fetchFromGitiles", "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9PT/tuxjREGsvSnYT2wyaL5sB52CcYPpKVKN0ZGldWU=", + "rev": "629e7ba7c964a62c97f6a882bffaec3c8490bb1e", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" }, "src/third_party/neon_2_sse/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff" + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" }, "src/third_party/openh264/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", - "url": "https://chromium.googlesource.com/openscreen", - "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665", + "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-u+El2jEnvlcQs5j5TthpKj8s255n2AhJPW+Q/s0Ljm0=", - "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "6e55da0c45788fdc22fa3aab7ead414fc42b74c1" + "hash": "sha256-U1cScrfKN0F+cy307RT2iwB6RYKeCNDRnkYxzamezoY=", + "rev": "a3895af47f600e3f9677f31fa39e15bd01c18457", + "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/8WQO0r10Hz3yLNh1MtjE8rGfzbpDkUowA2OPwEuRvA=", - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "43b72e3ce703b676c9c923b04540472d10790f56" + "hash": "sha256-xLx+dnUysm+HS1esu2hAqBKg/GgTJK4SQu1ZINr2aYc=", + "rev": "7ce535ddfc62d30166f35a8ed0f121da5eb0437c", + "url": "https://android.googlesource.com/platform/external/perfetto.git" }, "src/third_party/pthreadpool/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", - "rev": "1787867f6183f056420e532eec640cba25efafea" + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" }, "src/third_party/pyelftools": { "fetcher": "fetchFromGitiles", "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" }, "src/third_party/pywebsocket3/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" }, "src/third_party/re2/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-9V/Q5o24sL1TJUDNifUqpyrQ2zTSrhU0Bxo9qDwd0+4=", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "87d09ef4f0307e53f1d3796843f4b90d41cfccaa" + "hash": "sha256-m3bJlSyyhmj/7jvy7ExNX/gol7yeu1mnmyAc8u8Pr8s=", + "rev": "3d9bdbd0e208d3274a1cb1275c94d8b7626ddde2", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "src/third_party/ruy/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-hNco0Jol4vQS1bkYiXaoZ1IPHwoRq3DD3iY0TeLygew=", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "c04e5e52ae6b144f74ac032652e3c538bda15c9b" + "hash": "sha256-Zi3A49YqDE5S4iSpw9t9kTzitbQbcslm1zsepWX5cbw=", + "rev": "6ffa93a89376555b09134c59b84d8f5e9cfc6ce6", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Ck15ddYoo8pVLHcwW5P8Ei1sBQf23EGd/ySGOVSWAFQ=", - "url": "https://skia.googlesource.com/skia.git", - "rev": "b4f0c1163c955e42489f62d842585720cf0df0ea" + "hash": "sha256-CvoJxsBN1Nyh+RPgU+aptZW5WsfGB4hmSlhyma1wO+E=", + "rev": "349c1179c43ef46f2804404952b9460dc007d76a", + "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" }, "src/third_party/snappy/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", + "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b" + "hash": "sha256-wKsfwZpDRQzYQp6qls07uapgy9K3TWLOEUQlhIFpJtw=", + "rev": "cd9486849ba3c3ec753f556fd29c0aabee122a28", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-PCPb5opTATGCCQmw8TGF09TbLL8QES+So+yaL68H//I=", - "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "32f9332d1d7aacbdba7c1aa5df894bb1890bb2cc" + "hash": "sha256-Im4sdDo4b96YQIKDcAmqUk8PiJzejZgSDPur3hqPPRk=", + "rev": "d9ec9befba05a8dfca09c1e88f3f7be0e4b153c6", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" }, "src/third_party/text-fragments-polyfill/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-3gawK1S5+nr5yOAHgYozLWSoT1TbJmB6Md1fID6du9w=", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "91946956f81a2d9fd12a6d6baba20c997d3f8890" + "hash": "sha256-119/isDtopnj6MBRr3bzBvIppXw8M/ejcPx0CmIjXZU=", + "rev": "21e56c30e480ac67bed48335a5d122c59a6a6805", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-xYX77wsgG+2TzS0AinFJndnID5P3/anY4TPh3cjRaIY=", - "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "4b7a5f2a3522cbc4e4334cdc64bfaf3f832b89c3" + "hash": "sha256-lqCUx70IeHZ7YfE9DXia7dFok/JsFu/HSIv2AGi37YI=", + "rev": "2b783ed328d3a46e6a7a21218ced6b4dd1684114", + "url": "https://chromium.googlesource.com/vulkan-deps" }, "src/third_party/vulkan-deps/glslang/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Y9AmEtFPj+sp/a5YnHChqlqgW/1kdaJ1CEbBB5r2cuI=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "e3a711b6fc942307be7cb634698015dfd13c37fe" + "hash": "sha256-+Qs+Q3p11y9oUKyWEbuaQ0vx6hppFZSFbFuU0ve6rRo=", + "rev": "ebb0a8b28e5ea7a13146a24b3ad87b1966dbdfa3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" }, "src/third_party/vulkan-deps/spirv-cross/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-I8RXVat6//rlpmZuuC99Ar/Rct6MFce4FGKgQA2gBj0=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "54997fb4bc3adeb47b9b9f7bb67f1c25eaca2204" + "hash": "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A=", + "rev": "2de1265fca722929785d9acdec4ab728c47a0254", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" }, "src/third_party/vulkan-deps/spirv-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-OqLxyrTzg1Q2zmQd0YalWtl7vX5lRJFmE2VH7fHC8/8=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "d790ced752b5bfc06b6988baadef6eb2d16bdf96" + "hash": "sha256-JLFVzFNdXqxyKmg3NymIqqZmf2GAb7tYetQ6HJPsUIQ=", + "rev": "88bc5e321c2839707df8b1ab534e243e00744177", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" }, "src/third_party/vulkan-deps/spirv-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wFdAzbOQdOqeuVaWl5036qkli1gkSiL5JHH82Z5cFL4=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "4c16c35b16bbd462a0e89707ebeecc0bce956b2f" + "hash": "sha256-+HUDsp0COKlPtKidOVvUk7lN1AiFw01i5ANc3MO+qjs=", + "rev": "5084f58e5d187b16f84d2af936ff94ea2f46a00c", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" }, "src/third_party/vulkan-deps/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-9+tHkkHsP5ft6+tbofOYV1yBFDpFlJz4Q6YS8c6T5As=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "2634c969d7dc0e983f005f7f2e665cce8449efe6" + "hash": "sha256-UlaNc1NxTYulrF4Ol0rLysbLwbFR46Evq7WkWncPB8k=", + "rev": "f4bfcd885214675a6a0d7d4df07f52b511e6ea16", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" }, "src/third_party/vulkan-deps/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-q7/dYKQ3O0aSs326YbEeLlS+SciFWugBGm/G+b8RNd0=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "d34bfafff23602e857064bea6d99a35eb63f37f2" + "hash": "sha256-GbVr8LmwC6r7a13++5cYJXAq+H4P07quEHpTUV1qfqA=", + "rev": "7b7d15bc9f1d782e4d6ea34e61fd9a36a7952208", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" }, "src/third_party/vulkan-deps/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-tcaJmosHwTo38keV5qkumkLB1o1qq8v2ZmSsi2zDGoE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "389110e4600669d82bca042859fddf898387c0d2" + "hash": "sha256-vnrhYM7tcDTcXH4A+2leio5Wc1+b5H+7CQISEI+SPV8=", + "rev": "f7017f23337b90a2b2ceb65a4e1050e8ad89e065", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" }, "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-7M47ZCbNwIppaotMfJTFTRsYNvSZNc0FUufoyXyUu/g=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "dd26ae7065a9ed60c8ab517ed79bf7935394aec7" + "hash": "sha256-buxOdupK/w1sFGGHrEI+On2/mR0q5whvQNKUI8dxJ60=", + "rev": "dcfce25b439a2785f2c90b184e1964898070b4f1", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" }, "src/third_party/vulkan-deps/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-lj6MIQctcK6gsJlLdLwQ9PHbiAtTbNIPinii8vGZdGk=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "b89f48ae89ec064c91e8b77468cebc18c3faa682" + "hash": "sha256-LJd7pkcFd8k4npEv8mJy+47xo/5CXMN75ZAtDp+v6FI=", + "rev": "281e1c1c6b51bb6b33f88c18ed4da58ac3024311", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" }, "src/third_party/vulkan_memory_allocator": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "e87036508bb156f9986ea959323de1869e328f58" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd" + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" }, - "src/third_party/wayland-protocols/src": { + "src/third_party/wayland-protocols/gtk": { "fetcher": "fetchFromGitiles", - "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", - "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" }, "src/third_party/wayland-protocols/kde": { "fetcher": "fetchFromGitiles", "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" }, - "src/third_party/wayland-protocols/gtk": { + "src/third_party/wayland-protocols/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0ICSMZhnsLqMNfqSGjqM3p4ssxptkBtt7EMCpxknW4A=", + "rev": "3fda2fbf51db54398c0155facee82cc9533958a2", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" }, "src/third_party/webdriver/pylib": { "fetcher": "fetchFromGitiles", "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" }, "src/third_party/webgl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-h4by/1pp9oQGetZNnc1Rt5X5izgQf8ZUZDfsxQacqC0=", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "eab0468fc0405b21e59bea30a441d8e38c9db2b7" + "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", + "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Wch3opAvU/6rJVptOKxOJssev8NhNpbYZddScTlzuMw=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "4c8d2f67ecd03fbd3cb4c517ef8461427b6d635d" + "hash": "sha256-E39f0wy72TwQ9IM4QquqWxwDiHZOUI8hWkx2QDFcRog=", + "rev": "3dbe4ce12983ccc1ad42e228057c7d8adc17cb78", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-KpiNGAue945kGCuQYGhxiWVUFTE1tcntSAXBZdkrE9A=", - "url": "https://webrtc.googlesource.com/src.git", - "rev": "d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d" + "hash": "sha256-ju7sX1jrzg5BZOqdkcnFymRTqdFi7xkeHznKJQB1+08=", + "rev": "5ab829e4ca8f63be6b4ed1d98eee382d7307d34e", + "url": "https://webrtc.googlesource.com/src.git" }, - "src/third_party/wuffs/src": { + "src/third_party/weston/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" }, - "src/third_party/weston/src": { + "src/third_party/wuffs/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-sfJm1CBGXX13pFcqeOVPqWlXrUfwjRl+rYf2BoT8Bt8=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "775f8a1edf357f59e6b2e284297f396f4fac95a4" + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" }, "src/third_party/xdg-utils": { "fetcher": "fetchFromGitiles", - "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a" + "hash": "sha256-s9Avx9o+1igKulOpKhtbbkoINuh1wNercPszRaA4TZM=", + "rev": "bbbaa7352a3ea729987d3e654d37be93e8009691", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" }, - "src/tools/page_cycler/acid3": { + "src/third_party/zstd/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" + "hash": "sha256-95OOpYKGve+YWzqqguQIg1emTOAuaGyYpWxrWVDOKAQ=", + "rev": "cdceb0fce59785c841bf697e00067163106064e1", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" }, - "src/third_party/zstd/src": { + "src/tools/page_cycler/acid3": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yzv/R/GnqlXLeAjBEIev+8uM7MC0HeK0MfppnMTJ7Eg=", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "25822342be59d831bad65426ae51f5cc22157b09" + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Fn4HoS7O2J3nGXFyq7r7AheRQzKy80USTQnNnC4rWqM=", - "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "36e4828ab658b8ad72f80974883c4c94f6e7012c" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", - "owner": "nodejs", - "repo": "nan", - "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" - }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-SI4qIix+sXWIS3WJyJoTdPb1cmSIhpLAmfa9iX/5Jlg=", - "owner": "nodejs", - "repo": "node", - "rev": "v18.17.1" - }, - "src/third_party/squirrel.mac": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + "hash": "sha256-GevDXfVX4UxwTbgp2ZQbp3AFOHv5tECmyqLGIyYi5Tw=", + "rev": "71b6b5a68e0883c155e01368aace6eb6d71b85f3", + "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "version": "27.3.11", - "modules": "118", - "chrome": "118.0.5993.159", - "node": "18.17.1", + "electron_yarn_hash": "117vxam1044yy2akwjfhvb5dpfnv667pwbg92ac43551xfn0slcg", + "modules": "119", + "node": "18.18.2", + "version": "28.3.1" + }, + "29": { + "chrome": "122.0.6261.156", "chromium": { - "version": "118.0.5993.159", "deps": { "gn": { - "version": "2023-08-10", + "hash": "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=", + "rev": "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e", "url": "https://gn.googlesource.com/gn", - "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", - "hash": "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=" + "version": "2024-01-22" } - } + }, + "version": "122.0.6261.156" }, - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", - "electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964" - }, - "29": { + "chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs=", "deps": { - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-buW6hC7GIA59MTuyWg9/+EzQlFgJVN2IZrxlfisLemM=", - "owner": "electron", - "repo": "electron", - "rev": "v29.3.0" - }, "src": { "fetcher": "fetchFromGitiles", "hash": "sha256-5AmRq2pl3p0QtqyIjx4XDVE9Mnps18F9Z9MyH+38a0Y=", - "url": "https://chromium.googlesource.com/chromium/src.git", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", "rev": "122.0.6261.156", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/3VxptC6qAv9NCt8y1peJKTXTFI7blbvnpZ6D0VYyDk=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "28aa23ffb4c7344914a5b4ac7169f12e5a12333f" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O337gqiB4uiTWUgIfPdEa1Du+/ww+xYpmmZW9Py7uyQ=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "9986707a5f2fc6d5d1ffa7f224a032bdd45c95fd" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WPd6BlhNNF9n/qFU8atEh1fagbc05dWsFzBugw55boY=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "f400fdb561d4416b59b8f8a33d8ec8b79da60495" + "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { "fetcher": "fetchFromGitiles", "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" }, "src/chrome/test/data/perf/frame_rate/content": { "fetcher": "fetchFromGitiles", "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" }, "src/chrome/test/data/xr/webvr_info": { "fetcher": "fetchFromGitiles", "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" }, "src/docs/website": { "fetcher": "fetchFromGitiles", "hash": "sha256-sKbrY/m75LVWjWjhhjaeQnfXQP5AkEsEkZ+GmMNQJVo=", - "url": "https://chromium.googlesource.com/website.git", - "rev": "7474472013397bdb177cda70099f6411a5bd8212" + "rev": "7474472013397bdb177cda70099f6411a5bd8212", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-kp3SCEW90p9FWCvpoBc+obj45U3VAFuKIt5N/SDoWcg=", + "owner": "electron", + "repo": "electron", + "rev": "v29.3.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-mrnKQh2d6ewg1X8sCx8U4frHXyFKHuIUpvi0WBzg+PU=", - "url": "https://quiche.googlesource.com/quiche.git", - "rev": "0e39ce016ee1ec8271aa7216d547917c239db525" + "rev": "0e39ce016ee1ec8271aa7216d547917c239db525", + "url": "https://quiche.googlesource.com/quiche.git" }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", "hash": "sha256-h2b/f8MmldZSk3c84rvwO5+UZK36BFf/H9BStWFbDoo=", - "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "f9bad5e27d61e2ab6a7504b1793be5aa14eb1414" + "rev": "f9bad5e27d61e2ab6a7504b1793be5aa14eb1414", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zBY7MY6FXazzTW+nXvknkNar/odL0tzHXxHPmpYuy7E=", + "rev": "0f6fd3de81102058dc2ae299af1ad5287d2145dd", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" }, "src/third_party/angle/third_party/glmark2/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" }, "src/third_party/angle/third_party/rapidjson/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-zBY7MY6FXazzTW+nXvknkNar/odL0tzHXxHPmpYuy7E=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "0f6fd3de81102058dc2ae299af1ad5287d2145dd" + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-3+/zvwYAv3OGoKJatg+/c3OM1IyGq2iCyFWgu3b8VoU=", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "d024f05b39e21bb2a0b8205a7ce72b1b185b84c2" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "47107e384bd1dc25674acf04d000a8cdc6195234" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/lG4wfy5LVCMGuqKRZgf/NoxsAuCvyUdV1Anbzi0q+U=", - "url": "https://dawn.googlesource.com/dawn.git", - "rev": "6a6719ee09f1078356fdd31c69061e07b5c61c2d" + "rev": "d024f05b39e21bb2a0b8205a7ce72b1b185b84c2", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "62e175ef9fae75335575964c845a302447c012c7" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PGGwxNYgvZ//k+cr19iTG2QwC9Agu2T9k9QOhnX565s=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "701a2b1da0387ac6abf73bdbaf7864b9615db033" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wlneFqVEhM6fe9p10T22dx4dxnZzWwKHw+35eIlDGVM=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "dedb6316202c8c55b898e52248f1345241299125" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" - }, - "src/third_party/google_benchmark/src": { + "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f" + "hash": "sha256-PkvHqVKjGHxAYntylJxR5xnUVU1o8DJuBmsd9qkl/Yo=", + "rev": "4d202dab960a0b6a6e4757ab4393945aca5a09db", + "url": "https://beto-core.googlesource.com/beto-core.git" }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-shqUB+x7oXgtQqqfhkwXHwLLaJW1/L1vh1O+jvdsDP8=", - "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "414f69504d30d0848b69f6453ea7fb5e88004cb4" + "rev": "414f69504d30d0848b69f6453ea7fb5e88004cb4", + "url": "https://boringssl.googlesource.com/boringssl.git" }, "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", "hash": "sha256-7SmO5e/U2shYVslmCRPVLyfU5N4Rp1mzls8lLqIW8x8=", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "62ecd463583d09eb7d15b1d410055f30b2c7bcb4" + "rev": "62ecd463583d09eb7d15b1d410055f30b2c7bcb4", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "src/third_party/cast_core/public/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd" + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", "hash": "sha256-ixfmLcWTgVcHi2CXAulMXTaAyPYT42Q8VflStxmNRXc=", - "url": "https://chromium.googlesource.com/catapult.git", - "rev": "ab03292694695864b523636060e2a96b2c9b2df2" + "rev": "ab03292694695864b523636060e2a96b2c9b2df2", + "url": "https://chromium.googlesource.com/catapult.git" }, "src/third_party/ced/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", "hash": "sha256-px8BHI5Cp3vBRyei50dbxCTn/gydLsps1/SmJxxeGKw=", - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "d0dcd8802c22c1ac4a7d112782a4c75f0c6ca8ee" + "rev": "d0dcd8802c22c1ac4a7d112782a4c75f0c6ca8ee", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" }, "src/third_party/cld_3/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" }, "src/third_party/colorama/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "url": "https://chromium.googlesource.com/external/colorama.git", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49" + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" }, "src/third_party/cpu_features/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "936b9ab5515dead115606559502e3864958f7f6e" + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" }, "src/third_party/cpuinfo/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-56XE95dvaDF8E89V/le19Gk52fR0pqqyE38UgQo+GQM=", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "76cc10d627add77922dc24521b332a055a4d6d77" + "rev": "76cc10d627add77922dc24521b332a055a4d6d77", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" }, "src/third_party/crc32c/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2FuyB/TLKMbqgjvw0q19lcG85fedwlOmKKNlGevEzos=", + "rev": "ab7bdff32543991f52872c25cecf1f926702dfe3", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", "hash": "sha256-Tzn7Sx6k7BpH/UqMZHdLTk26FBp5QNcX0xWhztgRKrw=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "12d5e386005a211570cfdf9849d2fa6a3b38594b" + "rev": "12d5e386005a211570cfdf9849d2fa6a3b38594b", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" }, "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", "hash": "sha256-VxH1eOsJGQUk93EYexl1QrCpHTpgCOQP7H+oN0MZNpA=", - "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "1983b3f517da56c35c91296467458f71ad5b9340" + "rev": "1983b3f517da56c35c91296467458f71ad5b9340", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", + "rev": "47107e384bd1dc25674acf04d000a8cdc6195234", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/lG4wfy5LVCMGuqKRZgf/NoxsAuCvyUdV1Anbzi0q+U=", + "rev": "6a6719ee09f1078356fdd31c69061e07b5c61c2d", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PGGwxNYgvZ//k+cr19iTG2QwC9Agu2T9k9QOhnX565s=", + "rev": "701a2b1da0387ac6abf73bdbaf7864b9615db033", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wlneFqVEhM6fe9p10T22dx4dxnZzWwKHw+35eIlDGVM=", + "rev": "dedb6316202c8c55b898e52248f1345241299125", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", "hash": "sha256-C1l4piDzNENx6Vvtzu03HsBZTHIavO5AkmO6QXErh3Y=", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "6fc0c97ab284021b72e3bc962f7fa879ffcad65b" + "rev": "6fc0c97ab284021b72e3bc962f7fa879ffcad65b", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-Y7XPBkKU8p210dj7ydIDVJgiXx6ZQPP4D5Jfw3t9FCc=", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "3fa1fc736f46022f45c7ba7d817d1df1519c55d7" + "rev": "3fa1fc736f46022f45c7ba7d817d1df1519c55d7", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "src/third_party/dom_distiller_js/dist": { "fetcher": "fetchFromGitiles", "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8=", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3" + "rev": "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-lGNDwe3IiQMLg5o0AMhLfNpyfu4dXVk05YRO0yMzg0I=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.9.0" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/engflow-reclient-configs": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" }, "src/third_party/farmhash/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", "hash": "sha256-NRyMXRxnHJi5JiEJUxOxJyPGe5BGTxNbNyEOu1GyO8E=", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "17525de887d54b970ffdd421a0879c1db1952307" + "rev": "17525de887d54b970ffdd421a0879c1db1952307", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "src/third_party/flac": { "fetcher": "fetchFromGitiles", "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5" + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" }, "src/third_party/fontconfig/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", + "url": "https://chromium.googlesource.com/external/fontconfig.git" }, "src/third_party/fp16/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" - }, - "src/third_party/grpc/src": { + "src/third_party/freetype-testing/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-ogBt+haM+MoETsPIhwPDPZCLwQB9u9+w7OHL4us6kg8=", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "57617782464411201ce7bbc93b086c1b4d7d84a5" + "rev": "57617782464411201ce7bbc93b086c1b4d7d84a5", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, - "src/third_party/freetype-testing/src": { + "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" + "hash": "sha256-YEg+/562AX/hK0Adx9bUZqATt+5VDZjn/csWVhRji2M=", + "rev": "12e7428ab0847b1d1dc6c4b89203adfd1f16a1ad", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "src/third_party/fxdiv/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" }, - "src/third_party/harfbuzz-ng/src": { + "src/third_party/gemmlowp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "155015f4bec434ecc2f94621665844218f05ce51" + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" }, - "src/third_party/emoji-segmenter/src": { + "src/third_party/google_benchmark/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" }, - "src/third_party/ots/src": { + "src/third_party/googletest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, - "src/third_party/libgav1/src": { + "src/third_party/grpc/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ySRgjJUYFXTw5kys9WDSuxnmfzj1I4ImvTWi+7q0HXE=", - "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "35fea10bfdb790cf131ae74a4ee346905f34dc3c" + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, - "src/third_party/googletest/src": { + "src/third_party/harfbuzz-ng/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" + "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", + "rev": "155015f4bec434ecc2f94621665844218f05ce51", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" }, "src/third_party/hunspell_dictionaries": { "fetcher": "fetchFromGitiles", "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f" + "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" }, "src/third_party/leveldatabase/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" }, "src/third_party/libFuzzer/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YEg+/562AX/hK0Adx9bUZqATt+5VDZjn/csWVhRji2M=", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "12e7428ab0847b1d1dc6c4b89203adfd1f16a1ad" + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" }, "src/third_party/libaddressinput/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", "hash": "sha256-f65sdsMAWCWpsdTgyTzx5fwM/2ESm/cBCvU41s2BEV0=", - "url": "https://aomedia.googlesource.com/aom.git", - "rev": "1a72ea323d65e46eb90d08d492c04891abb91926" + "rev": "1a72ea323d65e46eb90d08d492c04891abb91926", + "url": "https://aomedia.googlesource.com/aom.git" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-rglws6GR11X8SdpYhK9CoxElWuPFYfp5b+vETjEoJOY=", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "e170c9366090cdc389d5f47ee3c2d7db71d263bc" + "rev": "e170c9366090cdc389d5f47ee3c2d7db71d263bc", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a" + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "url": "https://aomedia.googlesource.com/libavifinfo.git" }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-XsQrfj0R88qf0C/LtRUsset/lnRpBkbpGUr/ZE3qmyk=", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "4bdb5000ee7919724530cf89d50969e7b0ed58a7" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PkvHqVKjGHxAYntylJxR5xnUVU1o8DJuBmsd9qkl/Yo=", - "url": "https://beto-core.googlesource.com/beto-core.git", - "rev": "4d202dab960a0b6a6e4757ab4393945aca5a09db" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FDsK5sNy3YOrmaGpN3AhSExzBY9D8RGwoZKkjg/5vo0=", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "2ee210ca20767c949c4ff29bdffa1138eb0501fe" - }, - "src/third_party/ukey2/src": { + "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + "hash": "sha256-/3VxptC6qAv9NCt8y1peJKTXTFI7blbvnpZ6D0VYyDk=", + "rev": "28aa23ffb4c7344914a5b4ac7169f12e5a12333f", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, - "src/third_party/cros-components/src": { + "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2FuyB/TLKMbqgjvw0q19lcG85fedwlOmKKNlGevEzos=", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "ab7bdff32543991f52872c25cecf1f926702dfe3" + "hash": "sha256-O337gqiB4uiTWUgIfPdEa1Du+/ww+xYpmmZW9Py7uyQ=", + "rev": "9986707a5f2fc6d5d1ffa7f224a032bdd45c95fd", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "src/third_party/libdrm/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" }, - "src/third_party/expat/src": { + "src/third_party/libgav1/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + "hash": "sha256-ySRgjJUYFXTw5kys9WDSuxnmfzj1I4ImvTWi+7q0HXE=", + "rev": "35fea10bfdb790cf131ae74a4ee346905f34dc3c", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" }, "src/third_party/libipp/libipp": { "fetcher": "fetchFromGitiles", "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" }, "src/third_party/libjpeg_turbo": { "fetcher": "fetchFromGitiles", "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "9b894306ec3b28cea46e84c32b56773a98c483da" + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" }, "src/third_party/liblouis/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "url": "https://chromium.googlesource.com/external/liblouis-github.git", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" }, "src/third_party/libphonenumber/dist": { "fetcher": "fetchFromGitiles", "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" }, "src/third_party/libprotobuf-mutator/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" }, "src/third_party/libsrtp": { "fetcher": "fetchFromGitiles", "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" }, "src/third_party/libsync/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WPd6BlhNNF9n/qFU8atEh1fagbc05dWsFzBugw55boY=", + "rev": "f400fdb561d4416b59b8f8a33d8ec8b79da60495", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", "hash": "sha256-AUNWUicLMpEL/+r5c3JVjgZu9URBVsebayMs+ogNN6M=", - "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "893c9f6d070cc3bd8503152480089673f57fdf76" + "rev": "893c9f6d070cc3bd8503152480089673f57fdf76", + "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "src/third_party/libwebm/source": { "fetcher": "fetchFromGitiles", "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" }, "src/third_party/libwebp/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", - "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760" + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", + "url": "https://chromium.googlesource.com/webm/libwebp.git" }, "src/third_party/libyuv": { "fetcher": "fetchFromGitiles", "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "src/third_party/lss": { "fetcher": "fetchFromGitiles", "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" }, "src/third_party/material_color_utilities/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-sYLpJbgwR5POWqbUqu7IdWJ2Gibjz1PsMdSK+7yPDt4=", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", - "rev": "bec7bab60e6431201a82761ea4482b98b54c2af9" + "rev": "bec7bab60e6431201a82761ea4482b98b54c2af9", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" }, "src/third_party/minigbm/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5" + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" }, "src/third_party/nasm": { "fetcher": "fetchFromGitiles", "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "f477acb1049f5e043904b87b825c5915084a9a29" + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XsQrfj0R88qf0C/LtRUsset/lnRpBkbpGUr/ZE3qmyk=", + "rev": "4bdb5000ee7919724530cf89d50969e7b0ed58a7", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" }, "src/third_party/neon_2_sse/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff" + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" }, "src/third_party/openh264/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-habWfKhK66T537zJb/fm0IWpDbD2xgd9Upg97xRBy/M=", - "url": "https://chromium.googlesource.com/openscreen", - "rev": "b70c552bedf189fc238e98f8f69e6c30e7925207" + "rev": "b70c552bedf189fc238e98f8f69e6c30e7925207", + "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/buildtools": { "fetcher": "fetchFromGitiles", "hash": "sha256-o974IZvLUG2KlB1pQPYFwnoPGo239CV96pQPoQO7lvM=", - "url": "https://chromium.googlesource.com/chromium/src/buildtools", - "rev": "a9a6f0c49d0e8fa0cda37337430b4736ab3dc944" + "rev": "a9a6f0c49d0e8fa0cda37337430b4736ab3dc944", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", "hash": "sha256-XJAQBQjM0JzyeNy5ZU1KpfxE1U6lQtTEhg21riHHJ0E=", - "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "4c4f9ab25dab142d7888f3258ab54df24b97b44f" + "rev": "4c4f9ab25dab142d7888f3258ab54df24b97b44f", + "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", "hash": "sha256-DLu7p6tDImRC7sk+PqIZvyjpOVIZl3I/8rYX498DVTk=", - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "1e15d01da5d619ca617dcdd870efe3c35046a89c" + "rev": "1e15d01da5d619ca617dcdd870efe3c35046a89c", + "url": "https://android.googlesource.com/platform/external/perfetto.git" }, "src/third_party/pthreadpool/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", - "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8" + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" }, "src/third_party/pyelftools": { "fetcher": "fetchFromGitiles", "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" }, "src/third_party/pywebsocket3/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" }, "src/third_party/re2/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-3eAhiKUIMnpVCEuLWVCVOK3alVsxAJrEWtHBzvdjZkY=", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "826ad10e58a042faf57d7c329b0fd0a04b797e0b" + "rev": "826ad10e58a042faf57d7c329b0fd0a04b797e0b", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "src/third_party/ruy/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-gvzxHQEAK6D9qIr/Wf/s6TfBp9QorHlNi4qzSx5Ih/c=", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "cd7b92695b5d3f0c9ff65b865c2a1e19b99d766d" + "rev": "cd7b92695b5d3f0c9ff65b865c2a1e19b99d766d", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", "hash": "sha256-iJlxnQL0JsDPOFSyD0ubEMWtDJhtbqCsBtaQqWZt8q0=", - "url": "https://skia.googlesource.com/skia.git", - "rev": "8464f41cf051974e499be9caeab3243506e025c2" + "rev": "8464f41cf051974e499be9caeab3243506e025c2", + "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" }, "src/third_party/snappy/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FDsK5sNy3YOrmaGpN3AhSExzBY9D8RGwoZKkjg/5vo0=", + "rev": "2ee210ca20767c949c4ff29bdffa1138eb0501fe", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-brDFYmagGIH7fvRAP/JaCAMyuFLJKrc0jf0106gofiw=", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "a5270ae741714a5aad187ba8dcd8bddca39f791f" + "rev": "a5270ae741714a5aad187ba8dcd8bddca39f791f", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", "hash": "sha256-k0WzWDa/+48ogpbmECNDJKIED4wGu/Hm0DyGnCT9xoU=", - "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f" + "rev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" }, "src/third_party/text-fragments-polyfill/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-LOQH+qtltrahcPIutw/zYvEhmvbSjFBWT1mrg/pUD/0=", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "296f1e3cce03308c7fd5cdc7a76fbc3e41ec5214" + "rev": "296f1e3cce03308c7fd5cdc7a76fbc3e41ec5214", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", "hash": "sha256-bxg82G3dkugLXpTkfk/kNcKHKWn2i8+cCKPgfbaIVZ8=", - "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "c00c99b8e979ca1b1eba221a60cb1e1d3b12f956" + "rev": "c00c99b8e979ca1b1eba221a60cb1e1d3b12f956", + "url": "https://chromium.googlesource.com/vulkan-deps" }, "src/third_party/vulkan-deps/glslang/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-QKSPJuIJe44vVNZ8fjqRKc73CZV0fECcnXvY6QRec+0=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "57d86ab763da7b2cd1e00ecec8aa697403a8fd20" + "rev": "57d86ab763da7b2cd1e00ecec8aa697403a8fd20", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" }, "src/third_party/vulkan-deps/spirv-cross/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-VxwAs6mNOK/46VIJ0BroR41cNy2ywU+FQCgBatY1sBY=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "b82536766d1b81631b126d1ddbe49baf42929bd3" + "rev": "b82536766d1b81631b126d1ddbe49baf42929bd3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" }, "src/third_party/vulkan-deps/spirv-headers/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-TVfaGY9YjVHvR38OvuphsS68UIpBF21ghBg/2LL3gmE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "7b0309708da5126b89e4ce6f19835f36dc912f2f" + "rev": "7b0309708da5126b89e4ce6f19835f36dc912f2f", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" }, "src/third_party/vulkan-deps/spirv-tools/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-yUaUBCj3MqBwkGNC8ElJ/uvcm0Pl5BAdiWAw/Pi52Xo=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "c96fe8b943564fbab3424219d924d21cac2e877a" + "rev": "c96fe8b943564fbab3424219d924d21cac2e877a", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" }, "src/third_party/vulkan-deps/vulkan-headers/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40" + "rev": "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" }, "src/third_party/vulkan-deps/vulkan-loader/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-qvpwu4mmmLAFolLZt5q9XYgZff6BHO2Yapg93JUpBVA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "0b2b71306aebf1e11304b9f961f9a29ab0234756" + "rev": "0b2b71306aebf1e11304b9f961f9a29ab0234756", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" }, "src/third_party/vulkan-deps/vulkan-tools/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-C4xJwYkMqzmYk6lP7SQNXhCt6FyuH4+pqOHltuxJkOA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "7c6d640a5ca3ab73c1f42d22312f672b54babfaf" + "rev": "7c6d640a5ca3ab73c1f42d22312f672b54babfaf", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" }, "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45" + "rev": "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" }, "src/third_party/vulkan-deps/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-6YUjvPKjuuZdhBRfM+84btXvAHR2rj7ovocZnLS31JY=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "d26b50b03815ff226e6df478b4ddc4b98d8deaee" + "rev": "d26b50b03815ff226e6df478b4ddc4b98d8deaee", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" }, "src/third_party/vulkan_memory_allocator": { "fetcher": "fetchFromGitiles", "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-By+3qSfYs4dM4Hcjq2j4ZlSSPhagwqtNl//HKMrc5LY=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "af7f44122127b86a8c74cb7432909180f4899eaa" + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" }, - "src/third_party/wayland-protocols/src": { + "src/third_party/wayland-protocols/gtk": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", - "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5" + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" }, "src/third_party/wayland-protocols/kde": { "fetcher": "fetchFromGitiles", "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" }, - "src/third_party/wayland-protocols/gtk": { + "src/third_party/wayland-protocols/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=", + "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-By+3qSfYs4dM4Hcjq2j4ZlSSPhagwqtNl//HKMrc5LY=", + "rev": "af7f44122127b86a8c74cb7432909180f4899eaa", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" }, "src/third_party/webdriver/pylib": { "fetcher": "fetchFromGitiles", "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" }, "src/third_party/webgl/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed" + "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-RC2t+H44HyIvHLRcZyebSgVZvbmtw0vsy2KJRUlvTKs=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "e082b08475761a2ba6a3349dfea72f704c8b68d4" + "rev": "e082b08475761a2ba6a3349dfea72f704c8b68d4", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", "hash": "sha256-KipyGhohU2fQF67dDm4tPeH9xbFC2FNxhU4yiga5pwg=", - "url": "https://webrtc.googlesource.com/src.git", - "rev": "6b419a0536b1a0ccfff3682f997c6f19bcbd9bd8" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8" + "rev": "6b419a0536b1a0ccfff3682f997c6f19bcbd9bd8", + "url": "https://webrtc.googlesource.com/src.git" }, "src/third_party/weston/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7" + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" }, "src/third_party/xdg-utils": { "fetcher": "fetchFromGitiles", "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44" + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-JE3qg3lTpKTLgnpiNw6+wkhVXGx55MiyVDuvEp7Dk0Y=", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "a68aa0a24b0d3e1c75f2f7c0915b70121cee0470" - }, - "src/tools/page_cycler/acid3": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" + "rev": "a68aa0a24b0d3e1c75f2f7c0915b70121cee0470", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" }, "src/third_party/zstd/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-9FxRLrcbJoWAd+3Elr9mJ3vG6ilT6ZQZqdY9OiTpcWw=", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "050fec5c378d676fede8b2171ec5e84f6afa1504" + "rev": "050fec5c378d676fede8b2171ec5e84f6afa1504", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" }, "src/v8": { "fetcher": "fetchFromGitiles", "hash": "sha256-qDQ1rt/9nfv9L6RJLZDb1KTn9+Z70XDjkTs6gOt3u/Y=", - "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ddb4756a90fb7d89dc789859f8b2a3639d8de125" + "rev": "ddb4756a90fb7d89dc789859f8b2a3639d8de125", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", + "modules": "121", + "node": "20.9.0", + "version": "29.3.2" + }, + "30": { + "chrome": "124.0.6367.91", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=", + "rev": "22581fb46c0c0c9530caa67149ee4dd8811063cf", + "url": "https://gn.googlesource.com/gn", + "version": "2024-03-14" + } + }, + "version": "124.0.6367.91" + }, + "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ILapZYs/QPrhei3wplqdT19o6O5vatGrN/Kz7gOq6o0=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "124.0.6367.91", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2WyiSqza9Mp2G8KHUnrzfikC7hGcUTLu4/W9AD6Zdi4=", + "rev": "02057aa20e0dd4598967e3daf2f25c815962ef1c", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ERd8VqxIvGwZ9ckjvE6P8423cg6ASaFCsEDHYzqbN+4=", + "owner": "electron", + "repo": "electron", + "rev": "v30.0.2" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BJ3CCKFHOcIgIqnYxfjfOqbRhnt9ycrZfAFRZOLPYZQ=", + "rev": "9f8738892edd83219d2f83fdd73c7c14d5dbb80d", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/third_party/accessibility_test_framework/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", + "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", + "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O89W5dE97eUKpOnSuoBbl2BCigsDYK609Hq9pqd25CQ=", + "rev": "0b776d32f69a932acb61963d9daad9e13f610944", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-eQvZmm6aAsI+z++SMM9i/SsREjikIjMLpedzw57eKyA=", + "rev": "ec9827528085fcffca353c8d941ec20e3de7aaea", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZKvfil6V4PexxVl/UCW/mUINlCHBTrZnhTB0UhTW0PQ=", + "rev": "321a40ba18a083feccb8ae2f99a8676bb1702676", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7GkqH4hgTVmISjUy/Km/X28tBSsiMs3JRnDmol1zaag=", + "rev": "8bd72cfb219344308ee857bcbe65a27fe91acfe8", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RiDdH26xzoAD2NdTNKDraco9p2jKHXJxbRWI3pUhI78=", + "rev": "4fa4804c8ab4521079af62dba5260a99c34b8a29", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y=", + "rev": "76788faa4ef163081f82273bfca7fae8a734b971", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HhpP5OeGF9in2XEoZMfMCIAFHAqlDvJpfSWa8JfGWzM=", + "rev": "9128ec6d34905512199f953bc60ff75ca29d0cf2", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YwnqJynhunMvIduUcJ1/nBLabe/WS4RDox+XLMYMA2c=", + "rev": "e78e275e34f94fdf333245137878f0f6482db67d", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9QRj4OA1qWlZujVJ6Z9x3190taVjTCZocM/272eepIs=", + "rev": "aa4b2163b99ac9534194520f70b93eeefb0b3b4e", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-w2VosAdg+GtalFaGxDB8FB2w7498PMudsXxX4SpJqYE=", + "rev": "a254b37189cf97cfc76634644e58be511aefb69a", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dFp4Hy7fldUjXxUTtcyRXdt7zpIP2lchzDKkk0b+iko=", + "rev": "9a51dc89c4f21362e858b20a6a7cc8adfd7c7238", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4gQn5y/Z6ccYA/0VjIQfMpFMkEuPA78jyCgZ+FpmsFs=", + "rev": "acbea986f40578f43c88239c78c797f61842e642", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw=", + "rev": "006ca01d387ac6652825d6cce1a57b2de67dbf8d", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5/aYPboYWGrVAYy7T5b+gyER6vLTpnS2+kVDz6saK8A=", + "rev": "810e0537ebdd1e87ec62fb4fc4ee7a8105b0f096", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jn36GjAmmNjaCAA+4rKudNjPOpTgpLt9KhomIsAdwow=", + "rev": "bc18aec94c828f7dc3ba0eb8ad964dfb6453b903", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VTYTdvBNxqRzYjEx5ml4LnkDEUGpyvssSzDOndHyYgU=", + "rev": "3e45aee0b16dc724a79a0feb0490e2ddb06c9f0d", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YmjhwOjqCRxDhC7P+aRoNN+Vokl7hB4s6hDNFS5gLYo=", + "rev": "9c43bc14f1a7404fd4b6f744050d553acca557bf", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FVYUoK3KWlIjQTWlNkjmnzJDfpRkEZ9sFWTr4GdOUJw=", + "rev": "694ad4ed3c55195acd701950d2b2528880e9201e", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=", + "rev": "2a9055b50ed22101da7d77e999b90ed50956fe0b", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-9/TPxYbnQPDpWf/Zti8bTh22e/uFRlzs7SCThfx/byQ=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.11.1" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/engflow-reclient-configs": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5ynDd2wQ3QtS6SM2X+j3hTKB9aVhGrjoIlGSzy43K8Q=", + "rev": "52d8ef3799b2f16b66351dd0972bb0bcee1648ac", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FtFRJaxyp7vo4EPBiqx05OsKo1UA1g/h+9BjuoijLFA=", + "rev": "f42ce25563b73fed0123d18a2556b9ba01d2c76b", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-utl9uwFqMqDW9ll9/3lh3rfjmPHlv5sx/enQuPffQZ8=", + "rev": "bddcd9f77ba0a81a99ce50bcadf5149efe545df0", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", + "rev": "344117638c8ff7e239044fd0fa7085839fc03021", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mNYS3k2fAc7Q6GlpnO7pkXSkGHfUH1MXuZXkCmwG4q4=", + "rev": "c231e6f5b152029dbd5fa4a9e0c04095035aec3f", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", + "rev": "155015f4bec434ecc2f94621665844218f05ce51", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=", + "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zgtNjrQE+fzr8Aye0rAkQR5enzfacCAsRbC3crUrMQ4=", + "rev": "158761dfb40e77f3a54c3b14a596112837baa24b", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-moVf7i0gZ/KW53ACcVIWKWNL0oAimOSU1m5IdQHz6z8=", + "rev": "43ec9ace31c6ca11efddddb61b94b744450d46e2", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-k2bSS8OhVyd0/metFpwFvRCWYOaLEU0Md4AW50GpGTM=", + "rev": "80307e66e74bae927fb8709a549859e777e3bf0b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AdyX58sg//O2e76HAcRC5DcuiTsd68QS4mNVkPv0Vck=", + "rev": "ec88f0ab262c5f2426dbf138b92ee9ae5961e431", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tB9Wzjs4Sct7QendDMKkaEE4ddD6ptnNCmj1yYKcQSc=", + "rev": "f9a93151adf7203c6ab90f3c94bbd5972b7967b8", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE=", + "rev": "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5IsUUvhcKKiWJFetS29+S7Wiz5JwqRZGK2t2ehld/M4=", + "rev": "19832b1702d5b0adf616a0e080abd5207c8445b5", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", + "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" }, "src/third_party/nan": { "fetcher": "fetchFromGitHub", @@ -2634,12 +3260,143 @@ "repo": "nan", "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-lGNDwe3IiQMLg5o0AMhLfNpyfu4dXVk05YRO0yMzg0I=", - "owner": "nodejs", - "repo": "node", - "rev": "v20.9.0" + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YotKuKutnjuphwiElfQO6qpoNLhZGP6bqWZnW3Zv6QI=", + "rev": "33e682f24427a0eb634bd3186fe3c6fd96bd6768", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wUKhF9sU1HAZvs4fQHxeFfxkpkhBp6nTljJrQ4lH7lA=", + "rev": "a3f9719bed95289c59771d4c4bcb85f5ecacac43", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SBorO59kMSnskcp3oP5lrGQg+9cr/Ymey2aZGlRTgu0=", + "rev": "0ac67b7cef80e421283f633ee9c2ce652f6e42cc", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4CPHeZAJM756a2TIxs4ZX0D7j85deDIf/bTGow75m/U=", + "rev": "7b90b15a21cfdd3d74525616b5de04df94fa0583", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FeI+nAa5N8mQoA8gDSmWn6nw6TSPhDGwJI8/7r/5z1c=", + "rev": "a66020f87046d8934c22e20acb2bb8a91901ce8e", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/protobuf-javascript/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", + "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gB6vW6UJ60LrrGeNP6NKAcirIK6jgZjHRc6TA+pNXAQ=", + "rev": "6598a8ecd57724c8c7d43b2fca8eb9f9969ce57c", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-cwmKQJpR+7lp+dq8fGu6U8A+qmkXz6SlWvAdhBkKZOw=", + "rev": "587c2cf8b11d3c32fa26887063eda3171a3d353e", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8C8IMQjfJGeCXCXZyd/eSbDNsdcKI/Bul0m1wrqx1P8=", + "rev": "e2ea2eb3e0d37fff47968dfaaa337debb3b75b1e", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TsrSvL76H7SFhJWgHqyl8Y/BhAcnI9oaT2tUT6Ktan4=", + "rev": "f51e3fa404f5853650525549c78d7489a7f457b3", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" }, "src/third_party/squirrel.mac": { "fetcher": "fetchFromGitHub", @@ -2648,13 +3405,6 @@ "repo": "Squirrel.Mac", "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, "src/third_party/squirrel.mac/vendor/Mantle": { "fetcher": "fetchFromGitHub", "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", @@ -2662,30 +3412,197 @@ "repo": "Mantle", "rev": "78d3966b3c331292ea29ec38661b25df0a245948" }, - "src/third_party/engflow-reclient-configs": { + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { "fetcher": "fetchFromGitHub", - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - } - }, - "version": "29.3.0", - "modules": "121", - "chrome": "122.0.6261.156", - "node": "20.9.0", - "chromium": { - "version": "122.0.6261.156", - "deps": { - "gn": { - "version": "2024-01-22", - "url": "https://gn.googlesource.com/gn", - "rev": "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e", - "hash": "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=" - } + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tU0maePvL35JIVKFm+9hmPYDM81szLNYqUJyTKMHT0k=", + "rev": "bbe6452b420c5ddc4b0fd421b0a3ce271262f4ca", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Iqun3uMTCjGzHxUDeTCrvZufNtobnbqYVPDt7ZJ06wM=", + "rev": "55bc062601e4ee5a4efa834a84ae5c5ec6b28306", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MokWdjOP8Mc5hmoRrSXHXkobMPWbbmMzAMBOOoKG3gk=", + "rev": "3cebaae6743688201c8aa9b3694bba6948f0fa68", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-lP+N1d6jE+Cj5ofomgMEhbA6VbH5eKw83mY6zNIOfNk=", + "rev": "9f37ad360ea1c32162f0cc1799b1b292594fc771", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4=", + "rev": "8b246ff75c6615ba4532fe4fde20f1be090c3764", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/Cldtx75V+z3FuColEqwweyZHEqR2NaIj1Ha/vPoCsc=", + "rev": "c6615779ef8a1eb5ef48fef77bf3eb2cf4f5438d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4=", + "rev": "577baa05033cf1d9236b3d078ca4b3269ed87a2b", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4=", + "rev": "61a9c50248e09f3a0e0be7ce6f8bb1663855f979", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9qs0oS6W7x/1Z+wlFt91bqF09oxoloNPtjjH9mECJFk=", + "rev": "733fd2b522918f81f9c4669350dafd066f99c5d5", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0=", + "rev": "a4140c5fd47dcf3a030726a60b293db61cfb54a3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Bcm5yMo7JL/E6YZetlabkA0mkEFxbWriYNd8tRtgx5k=", + "rev": "5b8af92af052c83444ac560ff1e28c1c322424ef", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=", + "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YSo1DznmcaYSUcJl/3voVSfZfuLokAFQt6F3M1Iat28=", + "rev": "c35d1a3d1c0a1735afe5eb227cb826faa878ec19", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", + "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/duXwmqanyI2KEnV5izvr0kE8tJNI1F1jMMIY0ylLH8=", + "rev": "addbf812fd750dc8cebbd63732e7ce54a763fbee", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-USSfh+vUFrWnXYvZIORRb4AEGNSCPub2cNqEdZD9mKM=", + "rev": "a55ff9e83e4592010969d428bee656bace8cbc3b", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cmw+rj805YTnnCwy2Zwzi2ZW4sdX5JWjTnBaUB6+YyU=", + "rev": "7e696d941310a528dd2d6fbee3d499d19b24746d", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hWfYKiTzkmeiUTgNrSYXOFauusSVceVhD04Hgk69CK4=", + "rev": "621a263fb2e6c2175fbd489e5d77ee8038baa2b2", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-c+xwMud6rdGhfzf37h/j63rZrt9lt4MoqBD+GCSMZtI=", + "rev": "c546005d65b58039ccaf3f81be3772eee45454f9", + "url": "https://chromium.googlesource.com/v8/v8.git" } }, "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", - "chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs=" + "modules": "123", + "node": "20.11.1", + "version": "30.0.2" } } diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 128b1dc050672..bf0f7a3a4758f 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -1,81 +1,105 @@ #! /usr/bin/env nix-shell #! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git nix-universal-prefetch prefetch-yarn-deps prefetch-npm-deps +""" +electron updater -import logging -import click_log -import click -import random -import traceback -import csv +A script for updating both binary and source hashes. + +It supports the following modes: + +| Mode | Description | +|------------- | ----------------------------------------------- | +| `update` | for updating a specific Electron release | +| `update-all` | for updating all electron releases at once | +| `eval` | just print the necessary sources to fetch | + +The `eval` and `update` commands accept an optional `--version` flag +to restrict the mechanism only to a given major release. + +The `update` and `update-all` commands accept an optional `--commit` +flag to automatically commit the changes for you. + +The `update` and `update-all` commands accept optional `--bin-only` +and `--source-only` flags to restict the update to binary or source +releases. +""" import base64 +import csv +import json +import logging import os +import random import re -import tempfile import subprocess -import json import sys -from joblib import Parallel, delayed, Memory +import tempfile +import traceback +import urllib.request + +from abc import ABC from codecs import iterdecode from datetime import datetime +from typing import Iterable, Optional, Tuple from urllib.request import urlopen -os.chdir(os.path.dirname(__file__)) +import click +import click_log + +from joblib import Parallel, delayed, Memory depot_tools_checkout = tempfile.TemporaryDirectory() -subprocess.check_call([ - "nix-prefetch-git", - "--builder", "--quiet", - "--url", "https://chromium.googlesource.com/chromium/tools/depot_tools", - "--out", depot_tools_checkout.name, - "--rev", "7a69b031d58081d51c9e8e89557b343bba8518b1"]) +subprocess.check_call( + [ + "nix-prefetch-git", + "--builder", + "--quiet", + "--url", + "https://chromium.googlesource.com/chromium/tools/depot_tools", + "--out", + depot_tools_checkout.name, + "--rev", + "7a69b031d58081d51c9e8e89557b343bba8518b1", + ] +) sys.path.append(depot_tools_checkout.name) import gclient_eval import gclient_utils -memory = Memory("cache", verbose=0) -@memory.cache -def get_repo_hash(fetcher, args): - cmd = ['nix-universal-prefetch', fetcher] - for arg_name, arg in args.items(): - cmd.append(f'--{arg_name}') - cmd.append(arg) +# Relative path to the electron-source info.json +SOURCE_INFO_JSON = "info.json" - print(" ".join(cmd), file=sys.stderr) - out = subprocess.check_output(cmd) - return out.decode('utf-8').strip() +# Relatice path to the electron-bin info.json +BINARY_INFO_JSON = "binary/info.json" -@memory.cache -def _get_yarn_hash(file): - print(f'prefetch-yarn-deps', file=sys.stderr) - with tempfile.TemporaryDirectory() as tmp_dir: - with open(tmp_dir + '/yarn.lock', 'w') as f: - f.write(file) - return subprocess.check_output(['prefetch-yarn-deps', tmp_dir + '/yarn.lock']).decode('utf-8').strip() -def get_yarn_hash(repo, yarn_lock_path = 'yarn.lock'): - return _get_yarn_hash(repo.get_file(yarn_lock_path)) +# Number of spaces used for each indentation level +JSON_INDENT = 4 + +os.chdir(os.path.dirname(__file__)) + +memory: Memory = Memory("cache", verbose=0) + +logger = logging.getLogger(__name__) +click_log.basic_config(logger) -@memory.cache -def _get_npm_hash(file): - print(f'prefetch-npm-deps', file=sys.stderr) - with tempfile.TemporaryDirectory() as tmp_dir: - with open(tmp_dir + '/package-lock.json', 'w') as f: - f.write(file) - return subprocess.check_output(['prefetch-npm-deps', tmp_dir + '/package-lock.json']).decode('utf-8').strip() -def get_npm_hash(repo, package_lock_path = 'package-lock.json'): - return _get_npm_hash(repo.get_file(package_lock_path)) class Repo: - def __init__(self): - self.deps = {} + fetcher: str + args: dict + + def __init__(self) -> None: + self.deps: dict = {} self.hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" - def get_deps(self, repo_vars, path): - print("evaluating " + json.dumps(self, default = vars), file=sys.stderr) + def get_deps(self, repo_vars: dict, path: str) -> None: + print( + "evaluating " + json.dumps(self, default=vars, sort_keys=True), + file=sys.stderr, + ) deps_file = self.get_file("DEPS") - evaluated = gclient_eval.Parse(deps_file, filename='DEPS') + evaluated = gclient_eval.Parse(deps_file, filename="DEPS") repo_vars = dict(evaluated["vars"]) | repo_vars @@ -84,7 +108,12 @@ class Repo: self.deps = { prefix + dep_name: repo_from_dep(dep) for dep_name, dep in evaluated["deps"].items() - if (gclient_eval.EvaluateCondition(dep["condition"], repo_vars) if "condition" in dep else True) and repo_from_dep(dep) != None + if ( + gclient_eval.EvaluateCondition(dep["condition"], repo_vars) + if "condition" in dep + else True + ) + and repo_from_dep(dep) != None } for key in evaluated.get("recursedeps", []): @@ -92,80 +121,244 @@ class Repo: if dep_path in self.deps and dep_path != "src/third_party/squirrel.mac": self.deps[dep_path].get_deps(repo_vars, dep_path) - def prefetch(self): + def prefetch(self) -> None: self.hash = get_repo_hash(self.fetcher, self.args) - def prefetch_all(self): - return sum([dep.prefetch_all() for [_, dep] in self.deps.items()], [delayed(self.prefetch)()]) + def prefetch_all(self) -> int: + return sum( + [dep.prefetch_all() for [_, dep] in self.deps.items()], + [delayed(self.prefetch)()], + ) - def flatten_repr(self): - return { - "fetcher": self.fetcher, - "hash": self.hash, - **self.args - } + def flatten_repr(self) -> dict: + return {"fetcher": self.fetcher, "hash": self.hash, **self.args} - def flatten(self, path): - out = { - path: self.flatten_repr() - } + def flatten(self, path: str) -> dict: + out = {path: self.flatten_repr()} for dep_path, dep in self.deps.items(): out |= dep.flatten(dep_path) return out + def get_file(self, filepath: str) -> str: + raise NotImplementedError + + class GitRepo(Repo): - def __init__(self, url, rev): + def __init__(self, url: str, rev: str) -> None: super().__init__() - self.fetcher = 'fetchgit' + self.fetcher = "fetchgit" self.args = { "url": url, "rev": rev, } + class GitHubRepo(Repo): - def __init__(self, owner, repo, rev): + def __init__(self, owner: str, repo: str, rev: str) -> None: super().__init__() - self.fetcher = 'fetchFromGitHub' + self.fetcher = "fetchFromGitHub" self.args = { "owner": owner, "repo": repo, "rev": rev, } - def get_file(self, filepath): - return urlopen(f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}").read().decode('utf-8') + def get_file(self, filepath: str) -> str: + return ( + urlopen( + f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}" + ) + .read() + .decode("utf-8") + ) + class GitilesRepo(Repo): - def __init__(self, url, rev): + def __init__(self, url: str, rev: str) -> None: super().__init__() - self.fetcher = 'fetchFromGitiles' - #self.fetcher = 'fetchgit' + self.fetcher = "fetchFromGitiles" + # self.fetcher = 'fetchgit' self.args = { "url": url, "rev": rev, - #"fetchSubmodules": "false", + # "fetchSubmodules": "false", } if url == "https://chromium.googlesource.com/chromium/src.git": - self.args['postFetch'] = "rm -r $out/third_party/blink/web_tests; " - self.args['postFetch'] += "rm -r $out/third_party/hunspell/tests; " - self.args['postFetch'] += "rm -r $out/content/test/data; " - self.args['postFetch'] += "rm -r $out/courgette/testdata; " - self.args['postFetch'] += "rm -r $out/extensions/test/data; " - self.args['postFetch'] += "rm -r $out/media/test/data; " + self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; " + self.args["postFetch"] += "rm -r $out/third_party/hunspell/tests; " + self.args["postFetch"] += "rm -r $out/content/test/data; " + self.args["postFetch"] += "rm -r $out/courgette/testdata; " + self.args["postFetch"] += "rm -r $out/extensions/test/data; " + self.args["postFetch"] += "rm -r $out/media/test/data; " + + def get_file(self, filepath: str) -> str: + return base64.b64decode( + urlopen( + f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT" + ).read() + ).decode("utf-8") + + +class ElectronBinRepo(GitHubRepo): + def __init__(self, owner: str, repo: str, rev: str) -> None: + super().__init__(owner, repo, rev) + self.systems = { + "i686-linux": "linux-ia32", + "x86_64-linux": "linux-x64", + "armv7l-linux": "linux-armv7l", + "aarch64-linux": "linux-arm64", + "x86_64-darwin": "darwin-x64", + "aarch64-darwin": "darwin-arm64", + } + + def get_shasums256(self, version: str) -> list: + """Returns the contents of SHASUMS256.txt""" + try: + called_process: subprocess.CompletedProcess = subprocess.run( + [ + "nix-prefetch-url", + "--print-path", + f"https://github.com/electron/electron/releases/download/v{version}/SHASUMS256.txt", + ], + capture_output=True, + check=True, + text=True, + ) + + hash_file_path = called_process.stdout.split("\n")[1] + + with open(hash_file_path, "r") as f: + return f.read().split("\n") + + except subprocess.CalledProcessError as err: + print(err.stderr) + sys.exit(1) + + def get_headers(self, version: str) -> str: + """Returns the hash of the release headers tarball""" + try: + called_process: subprocess.CompletedProcess = subprocess.run( + [ + "nix-prefetch-url", + f"https://artifacts.electronjs.org/headers/dist/v{version}/node-v{version}-headers.tar.gz", + ], + capture_output=True, + check=True, + text=True, + ) + return called_process.stdout.split("\n")[0] + except subprocess.CalledProcessError as err: + print(err.stderr) + sys.exit(1) + + def get_hashes(self, major_version: str) -> dict: + """Returns a dictionary of hashes for a given major version""" + m, _ = get_latest_version(major_version) + version: str = m["version"] + + out = {} + out[major_version] = { + "hashes": {}, + "version": version, + } + + hashes: list = self.get_shasums256(version) + + for nix_system, electron_system in self.systems.items(): + filename = f"*electron-v{version}-{electron_system}.zip" + if any([x.endswith(filename) for x in hashes]): + out[major_version]["hashes"][nix_system] = [ + x.split(" ")[0] for x in hashes if x.endswith(filename) + ][0] + out[major_version]["hashes"]["headers"] = self.get_headers(version) + + return out - def get_file(self, filepath): - return base64.b64decode(urlopen(f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT").read()).decode('utf-8') -def repo_from_dep(dep): +# Releases that have reached end-of-life no longer receive any updates +# and it is rather pointless trying to update those. +# +# https://endoflife.date/electron +@memory.cache +def supported_version_range() -> range: + """Returns a range of electron releases that have not reached end-of-life yet""" + releases_json = json.loads( + urlopen("https://endoflife.date/api/electron.json").read() + ) + supported_releases = [ + int(x["cycle"]) + for x in releases_json + if x["eol"] == False + or datetime.strptime(x["eol"], "%Y-%m-%d") > datetime.today() + ] + + return range( + min(supported_releases), # incl. + # We have also packaged the beta release in nixpkgs, + # but it is not tracked by endoflife.date + max(supported_releases) + 2, # excl. + 1, + ) + + +@memory.cache +def get_repo_hash(fetcher: str, args: dict) -> str: + cmd = ["nix-universal-prefetch", fetcher] + for arg_name, arg in args.items(): + cmd.append(f"--{arg_name}") + cmd.append(arg) + + print(" ".join(cmd), file=sys.stderr) + out = subprocess.check_output(cmd) + return out.decode("utf-8").strip() + + +@memory.cache +def _get_yarn_hash(path: str) -> str: + print(f"prefetch-yarn-deps", file=sys.stderr) + with tempfile.TemporaryDirectory() as tmp_dir: + with open(tmp_dir + "/yarn.lock", "w") as f: + f.write(path) + return ( + subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"]) + .decode("utf-8") + .strip() + ) + + +def get_yarn_hash(repo: Repo, yarn_lock_path: str = "yarn.lock") -> str: + return _get_yarn_hash(repo.get_file(yarn_lock_path)) + + +@memory.cache +def _get_npm_hash(filename: str) -> str: + print(f"prefetch-npm-deps", file=sys.stderr) + with tempfile.TemporaryDirectory() as tmp_dir: + with open(tmp_dir + "/package-lock.json", "w") as f: + f.write(filename) + return ( + subprocess.check_output( + ["prefetch-npm-deps", tmp_dir + "/package-lock.json"] + ) + .decode("utf-8") + .strip() + ) + + +def get_npm_hash(repo: Repo, package_lock_path: str = "package-lock.json") -> str: + return _get_npm_hash(repo.get_file(package_lock_path)) + + +def repo_from_dep(dep: dict) -> Optional[Repo]: if "url" in dep: url, rev = gclient_utils.SplitUrlRevision(dep["url"]) - search_object = re.search(r'https://github.com/(.+)/(.+?)(\.git)?$', url) + search_object = re.search(r"https://github.com/(.+)/(.+?)(\.git)?$", url) if search_object: return GitHubRepo(search_object.group(1), search_object.group(2), rev) - if re.match(r'https://.+.googlesource.com', url): + if re.match(r"https://.+.googlesource.com", url): return GitilesRepo(url, rev) return GitRepo(url, rev) @@ -173,107 +366,404 @@ def repo_from_dep(dep): # Not a git dependency; skip return None -def get_gn_source(repo): + +def get_gn_source(repo: Repo) -> dict: gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'" gn_commit = re.search(gn_pattern, repo.get_file("DEPS")).group(1) - gn = subprocess.check_output([ - "nix-prefetch-git", - "--quiet", - "https://gn.googlesource.com/gn", - "--rev", gn_commit - ]) - gn = json.loads(gn) + gn_prefetch: bytes = subprocess.check_output( + [ + "nix-prefetch-git", + "--quiet", + "https://gn.googlesource.com/gn", + "--rev", + gn_commit, + ] + ) + gn: dict = json.loads(gn_prefetch) return { "gn": { "version": datetime.fromisoformat(gn["date"]).date().isoformat(), "url": gn["url"], "rev": gn["rev"], - "hash": gn["hash"] + "hash": gn["hash"], } } -def get_electron_info(major_version): - electron_releases = json.loads(urlopen("https://releases.electronjs.org/releases.json").read()) - major_version_releases = filter(lambda item: item["version"].startswith(f"{major_version}."), electron_releases) + +def get_latest_version(major_version: str) -> Tuple[str, str]: + """Returns the latest version for a given major version""" + electron_releases: dict = json.loads( + urlopen("https://releases.electronjs.org/releases.json").read() + ) + major_version_releases = filter( + lambda item: item["version"].startswith(f"{major_version}."), electron_releases + ) m = max(major_version_releases, key=lambda item: item["date"]) - rev=f"v{m['version']}" + rev = f"v{m['version']}" + return (m, rev) - electron_repo = GitHubRepo("electron", "electron", rev) - electron_repo.recurse = True - electron_repo.get_deps({ - f"checkout_{platform}": platform == "linux" - for platform in ["ios", "chromeos", "android", "mac", "win", "linux"] - }, "src/electron") +def get_electron_bin_info(major_version: str) -> Tuple[str, str, ElectronBinRepo]: + m, rev = get_latest_version(major_version) + electron_repo: ElectronBinRepo = ElectronBinRepo("electron", "electron", rev) return (major_version, m, electron_repo) -logger = logging.getLogger(__name__) -click_log.basic_config(logger) -@click.group() -def cli(): - pass +def get_electron_info(major_version: str) -> Tuple[str, str, GitHubRepo]: + m, rev = get_latest_version(major_version) + + electron_repo: GitHubRepo = GitHubRepo("electron", "electron", rev) + electron_repo.get_deps( + { + f"checkout_{platform}": platform == "linux" + for platform in ["ios", "chromeos", "android", "mac", "win", "linux"] + }, + "src/electron", + ) + + return (major_version, m, electron_repo) -@cli.command("eval") -@click.option("--version", help="The major version, e.g. '23'") -def eval(version): - (_, _, repo) = electron_repo = get_electron_info(version) - tree = electron_repo.flatten("src/electron") - print(json.dumps(tree, indent=4, default = vars)) -def get_update(repo): +def get_update(repo: Tuple[str, str, Repo]) -> Tuple[str, dict]: (major_version, m, electron_repo) = repo tasks = electron_repo.prefetch_all() - a = lambda: ( - ("electron_yarn_hash", get_yarn_hash(electron_repo)) - ) + a = lambda: (("electron_yarn_hash", get_yarn_hash(electron_repo))) tasks.append(delayed(a)()) a = lambda: ( - ("chromium_npm_hash", get_npm_hash(electron_repo.deps["src"], "third_party/node/package-lock.json")) + ( + "chromium_npm_hash", + get_npm_hash( + electron_repo.deps["src"], "third_party/node/package-lock.json" + ), + ) ) tasks.append(delayed(a)()) random.shuffle(tasks) - task_results = {n[0]: n[1] for n in Parallel(n_jobs=3, require='sharedmem', return_as="generator")(tasks) if n != None} + task_results = { + n[0]: n[1] + for n in Parallel(n_jobs=3, require="sharedmem", return_as="generator")(tasks) + if n != None + } tree = electron_repo.flatten("src/electron") - return (f"{major_version}", { - "deps": tree, - **{key: m[key] for key in ["version", "modules", "chrome", "node"]}, - "chromium": { - "version": m['chrome'], - "deps": get_gn_source(electron_repo.deps["src"]) - }, - **task_results - }) - -@cli.command("update") -@click.option("--version", help="The major version, e.g. '23'") -def update(version): + return ( + f"{major_version}", + { + "deps": tree, + **{key: m[key] for key in ["version", "modules", "chrome", "node"]}, + "chromium": { + "version": m["chrome"], + "deps": get_gn_source(electron_repo.deps["src"]), + }, + **task_results, + }, + ) + + +def load_info_json(path: str) -> dict: + """Load the contents of a JSON file + + Args: + path: The path to the JSON file + + Returns: An empty dict if the path does not exist, otherwise the contents of the JSON file. + """ try: - with open('info.json', 'r') as f: - old_info = json.loads(f.read()) + with open(path, "r") as f: + return json.loads(f.read()) except: - old_info = {} - repo = get_electron_info(version) - update = get_update(repo) - out = old_info | { update[0]: update[1] } - with open('info.json', 'w') as f: - f.write(json.dumps(out, indent=4, default = vars)) - f.write('\n') - -@cli.command("update-all") -def update_all(): - repos = Parallel(n_jobs=2, require='sharedmem')(delayed(get_electron_info)(major_version) for major_version in range(28, 24, -1)) - out = {n[0]: n[1] for n in Parallel(n_jobs=2, require='sharedmem')(delayed(get_update)(repo) for repo in repos)} - - with open('info.json', 'w') as f: - f.write(json.dumps(out, indent=4, default = vars)) - f.write('\n') + return {} + + +def save_info_json(path: str, content: dict) -> None: + """Saves the given info to a JSON file + + Args: + path: The path where the info should be saved + content: The content to be saved as JSON. + """ + with open(path, "w") as f: + f.write(json.dumps(content, indent=JSON_INDENT, default=vars, sort_keys=True)) + f.write("\n") + + +def update_bin(major_version: str, commit: bool) -> None: + """Update a given electron-bin release + + Args: + major_version: The major version number, e.g. '27' + commit: Whether the updater should commit the result + """ + package_name = f"electron_{major_version}-bin" + print(f"Updating {package_name}") + + electron_bin_info = get_electron_bin_info(major_version) + (_major_version, _version, repo) = electron_bin_info + + old_info = load_info_json(BINARY_INFO_JSON) + new_info = repo.get_hashes(major_version) + + out = old_info | new_info + + save_info_json(BINARY_INFO_JSON, out) + + old_version = ( + old_info[major_version]["version"] if major_version in old_info else None + ) + new_version = new_info[major_version]["version"] + if old_version == new_version: + print(f"{package_name} is up-to-date") + elif commit: + commit_result(package_name, old_version, new_version, BINARY_INFO_JSON) + + +def update_source(major_version: str, commit: bool) -> None: + """Update a given electron-source release + + Args: + major_version: The major version number, e.g. '27' + commit: Whether the updater should commit the result + """ + package_name = f"electron-source.electron_{major_version}" + print(f"Updating electron-source.electron_{major_version}") + + old_info = load_info_json(SOURCE_INFO_JSON) + old_version = ( + old_info[str(major_version)]["version"] + if str(major_version) in old_info + else None + ) + + electron_source_info = get_electron_info(major_version) + new_info = get_update(electron_source_info) + out = old_info | {new_info[0]: new_info[1]} + + save_info_json(SOURCE_INFO_JSON, out) + + new_version = new_info[1]["version"] + if old_version == new_version: + print(f"{package_name} is up-to-date") + elif commit: + commit_result(package_name, old_version, new_version, SOURCE_INFO_JSON) + + +def non_eol_releases(releases: Iterable[int]) -> Iterable[int]: + """Returns a list of releases that have not reached end-of-life yet.""" + return tuple(filter(lambda x: x in supported_version_range(), releases)) + + +def update_all_source(commit: bool) -> None: + """Update all eletron-source releases at once + + Args: + commit: Whether to commit the result + """ + old_info = load_info_json(SOURCE_INFO_JSON) + + filtered_releases = non_eol_releases(tuple(map(lambda x: int(x), old_info.keys()))) + + # This might take some time + repos = Parallel(n_jobs=2, require="sharedmem")( + delayed(get_electron_info)(major_version) for major_version in filtered_releases + ) + new_info = { + n[0]: n[1] + for n in Parallel(n_jobs=2, require="sharedmem")( + delayed(get_update)(repo) for repo in repos + ) + } + + if commit: + for major_version in filtered_releases: + # Since the sources have been fetched at this point already, + # fetching them again will be much faster. + update_source(str(major_version), commit) + else: + out = old_info | {new_info[0]: new_info[1]} + save_info_json(SOURCE_INFO_JSON, out) + + +def parse_cve_numbers(tag_name: str) -> Iterable[str]: + """Returns mentioned CVE numbers from a given release tag""" + cve_pattern = r"CVE-\d{4}-\d+" + url = f"https://api.github.com/repos/electron/electron/releases/tags/{tag_name}" + headers = { + "Accept": "application/vnd.github+json", + "X-GitHub-Api-Version": "2022-11-28", + } + request = urllib.request.Request(url=url, headers=headers) + release_note = "" + try: + with urlopen(request) as response: + release_note = json.loads(response.read().decode("utf-8"))["body"] + except: + print( + f"WARN: Fetching release note for {tag_name} from GitHub failed!", + file=sys.stderr, + ) + + return sorted(re.findall(cve_pattern, release_note)) + + +def commit_result( + package_name: str, old_version: Optional[str], new_version: str, path: str +) -> None: + """Creates a git commit with a short description of the change + + Args: + package_name: The package name, e.g. `electron-source.electron-{major_version}` + or `electron_{major_version}-bin` + + old_version: Version number before the update. + Can be left empty when initializing a new release. + + new_version: Version number after the update. + + path: Path to the lockfile to be committed + """ + assert ( + isinstance(package_name, str) and len(package_name) > 0 + ), "Argument `package_name` cannot be empty" + assert ( + isinstance(new_version, str) and len(new_version) > 0 + ), "Argument `new_version` cannot be empty" + + if old_version != new_version: + major_version = new_version.split(".")[0] + cve_fixes_text = "\n".join( + list( + map(lambda cve: f"- Fixes {cve}", parse_cve_numbers(f"v{new_version}")) + ) + ) + init_msg = f"init at {new_version}" + update_msg = f"{old_version} -> {new_version}" + diff = f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n" if old_version != None else "" + commit_message = f"""{package_name}: {update_msg if old_version != None else init_msg} + +- Changelog: https://github.com/electron/electron/releases/tag/v{new_version} +{diff}{cve_fixes_text} +""" + subprocess.run( + [ + "git", + "add", + path, + ] + ) + subprocess.run( + [ + "git", + "commit", + "-m", + commit_message, + ] + ) + + +@click.group() +def cli() -> None: + """A script for updating electron-bin and electron-source hashes""" + pass + + +@cli.command( + "eval", help="Print the necessary sources to fetch for a given major release" +) +@click.option("--version", help="The major version, e.g. '23'") +def eval(version): + (_, _, repo) = electron_repo = get_electron_info(version) + tree = repo.flatten("src/electron") + print(json.dumps(tree, indent=JSON_INDENT, default=vars, sort_keys=True)) + + +@cli.command("update", help="Update a single major release") +@click.option("-v", "--version", help="The major version, e.g. '23'") +@click.option( + "-b", + "--bin-only", + is_flag=True, + default=False, + help="Only update electron-bin packages", +) +@click.option( + "-s", + "--source-only", + is_flag=True, + default=False, + help="Only update electron-source packages", +) +@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result") +def update(version: str, bin_only: bool, source_only: bool, commit: bool) -> None: + assert isinstance(version, str) and len(version) > 0, "version must be non-empty" + + if bin_only and source_only: + print( + "Error: Omit --bin-only and --source-only if you want to update both source and binary packages.", + file=sys.stderr, + ) + sys.exit(1) + + elif bin_only: + update_bin(version, commit) + + elif source_only: + update_source(version, commit) + + else: + update_bin(version, commit) + update_source(version, commit) + + +@cli.command("update-all", help="Update all releases at once") +@click.option( + "-b", + "--bin-only", + is_flag=True, + default=False, + help="Only update electron-bin packages", +) +@click.option( + "-s", + "--source-only", + is_flag=True, + default=False, + help="Only update electron-source packages", +) +@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result") +def update_all(bin_only: bool, source_only: bool, commit: bool) -> None: + # Filter out releases that have reached end-of-life + filtered_bin_info = dict( + filter( + lambda entry: int(entry[0]) in supported_version_range(), + load_info_json(BINARY_INFO_JSON).items(), + ) + ) + + if bin_only and source_only: + print( + "Error: omit --bin-only and --source-only if you want to update both source and binary packages.", + file=sys.stderr, + ) + sys.exit(1) + + elif bin_only: + for major_version, _ in filtered_bin_info.items(): + update_bin(major_version, commit) + + elif source_only: + update_all_source(commit) + + else: + for major_version, _ in filtered_bin_info.items(): + update_bin(major_version, commit) + + update_all_source(commit) + if __name__ == "__main__": cli() diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index ed1a6c1a23b7e..ffb644aaea40a 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "goperf"; - version = "unstable-2023-11-08"; + version = "0-unstable-2023-11-08"; src = fetchgit { url = "https://go.googlesource.com/perf"; @@ -22,8 +22,8 @@ buildGoModule rec { export UPDATE_NIX_ATTR_PATH=goperf ${lib.escapeShellArgs (unstableGitUpdater { inherit (src) url; })} set -x - oldhash="$(nix-instantiate . --eval --strict -A "goperf.go-modules.drvAttrs.outputHash" | cut -d'"' -f2)" - newhash="$(nix-build -A goperf.go-modules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + oldhash="$(nix-instantiate . --eval --strict -A "goperf.goModules.drvAttrs.outputHash" | cut -d'"' -f2)" + newhash="$(nix-build -A goperf.goModules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" fname="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" goperf).file' | cut -d'"' -f2)" ${lib.getExe sd} --string-mode "$oldhash" "$newhash" "$fname" ''; diff --git a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock index 49986d256fd90..6127a15eead72 100644 --- a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock +++ b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock @@ -124,9 +124,9 @@ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "els" -version = "0.1.48-nightly.0" +version = "0.1.48-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc7d9b7e85dd36847b2e3fcb4a400c1f25a49c7ecfa0e9f25bdad91070cba32" +checksum = "d1160cfdc48996a3f0f1e8e5b2d060e48ab7245e3931eef154fe0afc4de6d55e" dependencies = [ "erg_common", "erg_compiler", @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.36-nightly.0" +version = "0.6.36-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25256e6a5de7886319cf6bc830b92b04a9f722eac3fdf43a82fc9d43e9336a1" +checksum = "f19dd94255e83e016cd6d7cd18e99e9c927e2144cf9d17e759271c40c6cf1dcd" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -150,9 +150,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.36-nightly.0" +version = "0.6.36-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d224db567e7d13a30a52f7178623434922d781d8bc4310c7adae7052ec21cb18" +checksum = "0c4712faf4c949016d752e7d697dab1df44043eaf94bea5a2ada73b1ab70dfe0" dependencies = [ "erg_common", "erg_parser", @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.36-nightly.0" +version = "0.6.36-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ba6fbccd31c15bc032fbd52be75b7965f10a192adfed440e2d961bdd52e47f" +checksum = "791e826192978d665e46aa30aa7330ef470b90e6e5ebe38c2b32a2a4141bc919" dependencies = [ "erg_common", "erg_proc_macros", @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.36-nightly.0" +version = "0.6.36-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f73fb45d76f14edb6076c1b0bbd0c9ee7531663595674dd6ae667d13fed769" +checksum = "119857fa1bb184c6b2adba2e3b2a71797f6c7865bc6d4fdddac988fda9e55b77" dependencies = [ "quote", "syn 1.0.109", @@ -536,7 +536,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.53" +version = "0.0.54" dependencies = [ "erg_common", "erg_compiler", @@ -546,7 +546,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.53" +version = "0.0.54" dependencies = [ "els", "erg_common", diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 97e927d3f442e..92607901caf5f 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.53"; + version = "0.0.54"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-x/52dDNuMOoN0gbBTPEhXZpfdVk0kJaBv9tMsh2pOiA="; + hash = "sha256-GUZMzV0yztlLcxvuTAuRoQ4eQhoMMyqjdu3cfOCJCJE="; }; cargoLock = { diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 0b1711283dbd3..1adea9552be07 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.4.1"; + version = "4.4.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-tXXGjpf6nwx9yW9vBSi7iKlDJE+IeItcl+JE4drA7OM="; + sha256 = "sha256-5Loc9H5wqafoZYjPGCJ4kTNulS1/Njgn35T74zHr9s4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix index a66ae2aa35ea0..28364b8beeedf 100644 --- a/pkgs/development/tools/misc/c2ffi/default.nix +++ b/pkgs/development/tools/misc/c2ffi/default.nix @@ -24,6 +24,9 @@ llvmPackages.stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { url = "https://github.com/rpav/c2ffi.git"; branch = c2ffiBranch; + # Tags only exist for older LLVM versions, so they would result in nonsense names + # like: c2ffi-llvm-16.0.0-11.0.0.0-unstable-YYYY-MM-DD + hardcodeZeroVersion = true; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 34fd43cf86ce3..d64e3c91ae7e0 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -7,13 +7,13 @@ luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "nix_v3.5.0-1-unstable-2024-04-28"; + version = "0-unstable-2024-04-29"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; rev = "a473a8f479711682f5b97a72362736d96efd463b"; - sha256 = "sha256-hsjv+jlLsoIDM4gB/0mFeoVu1YZ1I9ELDALLTEnlCF0="; + hash = "sha256-hsjv+jlLsoIDM4gB/0mFeoVu1YZ1I9ELDALLTEnlCF0="; }; propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -24,6 +24,15 @@ luarocks.overrideAttrs (old: { patches = [ ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + # tags incompletely inherited from regular luarocks + hardcodeZeroVersion = true; + }; + }; + + # old.meta // { /* ... */ } doesn't update meta.position, which breaks the updateScript + meta = { + inherit (old.meta) description license maintainers platforms; + mainProgram = "luarocks"; }; }) diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix index a4c3179e8e586..7c9f474ab531a 100644 --- a/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/pkgs/development/tools/misc/nix-bisect/default.nix @@ -6,7 +6,7 @@ let pname = "nix-bisect"; - version = "0.4.1"; + version = "0.4.1-unstable-2024-04-19"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -15,23 +15,10 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "timokau"; repo = pname; - rev = "v${version}"; - hash = "sha256-01vj35mMakqKi5zbMIPQ+R8xdkOWbzpnigd3/SU+svw="; + rev = "4f26082fec0817acbfa8cc6ca4c25caaf77ddcd2"; + hash = "sha256-zyeE1jYo/9NEG8fB4gQBAR01siP4tyLvjjHN1yUS4Ug="; }; - patches = [ - (fetchpatch { - # Fixes compatibility with recent nix versions - url = "https://github.com/timokau/nix-bisect/commit/01eefe174b740cb90e48b06d67d5582d51786b96.patch"; - hash = "sha256-Gls/NtHH7LujdEgLbcIRZ12KsJDrasXIMcHeeBVns4A="; - }) - (fetchpatch { - # Fixes TypeError crashes associated with drvs_failed inconsistency - url = "https://github.com/timokau/nix-bisect/commit/9f3a17783046baae64c16f9e2be917c2603977fc.patch"; - hash = "sha256-U9NUtgwslcgIf/wvH/WE7t0HGs2OP3wvYDKrb5j+lp0="; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ appdirs numpy diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index c2d9b2c0bedec..212f0b8cebc41 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2024-01-15"; + version = "0.18.0-unstable-2024-01-15"; src = fetchFromGitHub { owner = "NixOS"; diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index 568b6a172c4ca..641dd140d8b26 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-3rMSk4oRqPWqJh4o+oGtfqpEz4zkr4CVaIyMvBopN/o="; + sha256 = "sha256-flmTVEEM0vEU4Aul7+PPo0ut1xv63l4HljEPXSPd6SU="; }; - vendorHash = "sha256-ZP4EM7NZwfTLx0e47DikgMI7Y+IYmREdLL/r/CC9P7c="; + vendorHash = "sha256-XmJafFW5Hb8A8mKz/ewJIKMQ5hiZlAJk2yFdTB3VxNg="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 529d9b69ed3b0..b4c2afb080722 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-/ViyS7srbOoZJDvDCRoNYWkdCYi3F1Pr0gSSFF0M1ak="; + hash = "sha256-oLN7FU7Er0GnfOhoKd0bSsiB7uZsr2BNL3aSDrWJEUw="; }; - vendorHash = "sha256-JNOlMf+PIONokw5t2xhz1Y+b5VwRDG7BKODl8fHCcJY="; + vendorHash = "sha256-2YsFwWalMhbZP4vdEQguCijGC9kCiqDpfZCAKVOk5bs="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 6ae0df232727d..2e693c7f44d37 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; rev = "refs/tags/v${version}"; - hash = "sha256-2+miC7cp6YbeI7uucFlSdlDpPboJOhhBq7/eqXxZVqs="; + hash = "sha256-Ut/QeckPdgaVPYNWNjo6RCmLOc2EOXfcqRIC14I/Ruk="; }; - cargoHash = "sha256-I+nh6cKniPIG5VYMMsABZNSP/c3DLWswsjenaQBh/X8="; + cargoHash = "sha256-EJ9ij3Q10CehhrJ/nyXOuqVhiVVfHHhyqIcq8fVmzTU="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/sea-orm-cli/default.nix b/pkgs/development/tools/sea-orm-cli/default.nix index a983924c0c014..98b52a55af8dc 100644 --- a/pkgs/development/tools/sea-orm-cli/default.nix +++ b/pkgs/development/tools/sea-orm-cli/default.nix @@ -8,11 +8,11 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "0.12.10"; + version = "0.12.15"; src = fetchCrate { inherit pname version; - hash = "sha256-BVQbzP/+TJFqhnBeerYiLMpJJ8q9x582DR5X10K027U="; + hash = "sha256-eRsWQXaE8zzECPY+xxVIwTylbuSPT6ABamI4WNVkw8M="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-qCcWReo72eHN9MoTVAmSHYVhpqw0kZ9VU/plYRcirVA="; + cargoHash = "sha256-sIyKkTO2DSLkRAlSUSRQYrZb8UtKZrszjn2jELNOSOU="; meta = with lib; { homepage = "https://www.sea-ql.org/SeaORM"; diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index 47f302a2ac78d..571d226ea5178 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.6"; + version = "0.17.7"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-VgPc78xhafRlEUfNMKiYDyWqZVtYDkqwVDQ3BG9r70w="; + hash = "sha256-esLS7syckxdYpP3I2kKYXEFpTyV4+VQCiCV5cXJfexs="; }; proxyVendor = true; - vendorHash = "sha256-YmjQj116egYhcpJ9Vps1d30bfCY6pAu/mA9MEzXVJb8="; + vendorHash = "sha256-hH8dje3ajG1KNi7jEkaEgzCGJuvrZiNhIBC0my0wljM="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index bb063fdfe32e9..8fd63f6e30a3f 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2023-12-05"; + version = "0-unstable-2023-12-05"; src = fetchFromGitHub { owner = "vala-lang"; diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 5f8c043b196fc..1b7b34c70bd0e 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yamlfmt"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7+ui5jEJkjejAZRdM+okoF3Qw8SJSTKJS7LNNnBgz0g="; + sha256 = "sha256-hT5+7WaFl19iIdXWFPD82BE9z/2wzHKJJvVE4ZpZwsk="; }; - vendorHash = "sha256-JiFVc2+LcCgvnEX6W4XBtIgXcILEO2HZT4DTp62eUJU="; + vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; doCheck = false; diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index 47ddf77634bfa..5c00fbbc457b6 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.1.1"; + version = "4.2.1"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-75bERA1uZeywMjYznFDyk4+AtVDLo7eIajVtWdAD/RA="; + hash = "sha256-id/Z7oqwoIIWaOU5mQ7vuPRQw6WQAKcDAopYB2tEl0s="; }; buildInputs = [ diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix index 2800e770ba0e8..f34276c7783f2 100644 --- a/pkgs/games/doom-ports/gzdoom/default.nix +++ b/pkgs/games/doom-ports/gzdoom/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.12.1"; + version = "4.12.2"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-ityjfxlazt/R9vD+azVGr+w7Sdjlbh+ekbJexkPSF1g="; + hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 15dbc82c6d901..a314b6c27428e 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,9 +1,9 @@ { "1.20": { - "sha1": "8dd1a28015f51b1803213892b50b7b4fc76e594d", - "url": "https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/server.jar", - "version": "1.20.4", - "javaVersion": 17 + "sha1": "79493072f65e17243fd36a699c9a96b4381feb91", + "url": "https://piston-data.mojang.com/v1/objects/79493072f65e17243fd36a699c9a96b4381feb91/server.jar", + "version": "1.20.5", + "javaVersion": 21 }, "1.19": { "url": "https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar", diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index f500a7971315a..fd5067b0faea3 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.14"; + version = "2.25.15"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-b0qfNjr5jxEJbCYINX2/JhESMOIf9DefRHI47gn5Zio="; + hash = "sha256-K2CV4sWhUndiglBze44xbfrPe19nU+9qn+WOWLMA0R8="; }; passthru.updateScript = { diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index b7cf5484c9e94..4295dc213af9d 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,72 +1,64 @@ -{ stdenv, lib, stdenvNoCC -, makeScopeWithSplicing', generateSplicesForMkScope -, buildPackages -, fetchgit, fetchzip +{ + lib, + makeScopeWithSplicing', + generateSplicesForMkScope, + callPackage, + crossLibcStdenv, + attributePathToSplice ? [ "freebsd" ], + branch ? "release/13.1.0", }: let - inherit (buildPackages.buildPackages) rsync; - versions = builtins.fromJSON (builtins.readFile ./versions.json); - version = "13.1.0"; - branch = "release/${version}"; - -in makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "freebsd"; - f = (self: lib.packagesFromDirectoryRecursive { - callPackage = self.callPackage; - directory = ./pkgs; - } // { - sourceData = versions.${branch}; - - ports = fetchzip { - url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; - sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; - }; - - compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat; - freebsd-lib = import ./lib { inherit version; }; - - # The manual callPackages below should in principle be unnecessary, but are - # necessary. See note in ../netbsd/default.nix - - compat = self.callPackage ./pkgs/compat/package.nix { - inherit stdenv; - inherit (buildPackages.freebsd) makeMinimal boot-install; - }; - - csu = self.callPackage ./pkgs/csu.nix { - inherit (buildPackages.freebsd) makeMinimal install gencat; - inherit (self) include; - }; - - include = self.callPackage ./pkgs/include/package.nix { - inherit (buildPackages.freebsd) makeMinimal install rpcgen; + badBranchError = + branch: + throw '' + Unknown FreeBSD branch ${branch}! + FreeBSD branches normally look like one of: + * `release/<major>.<minor>.0` for tagged releases without security updates + * `releng/<major>.<minor>` for release update branches with security updates + * `stable/<major>` for stable versions working towards the next minor release + * `main` for the latest development version + + Branches can be selected by overriding the `branch` attribute on the freebsd package set. + ''; + + # `./package-set.nix` should never know the name of the package set we + # are constructing; just this function is allowed to know that. This + # is why we: + # + # - do the splicing for cross compilation here + # + # - construct the *anonymized* `buildFreebsd` attribute to be passed + # to `./package-set.nix`. + callFreeBSDWithAttrs = + extraArgs: + let + # we do not include the branch in the splice here because the branch + # parameter to this file will only ever take on one value - more values + # are provided through overrides. + otherSplices = generateSplicesForMkScope attributePathToSplice; + in + makeScopeWithSplicing' { + inherit otherSplices; + f = + self: + { + inherit branch; + } + // callPackage ./package-set.nix ( + { + sourceData = versions.${self.branch} or (throw (badBranchError self.branch)); + versionData = self.sourceData.version; + buildFreebsd = otherSplices.selfBuildHost; + patchesRoot = ./patches/${self.versionData.revision}; + } + // extraArgs + ) self; }; - - install = self.callPackage ./pkgs/install.nix { - inherit (buildPackages.freebsd) makeMinimal; - inherit (self) mtree libnetbsd; - }; - - libc = self.callPackage ./pkgs/libc/package.nix { - inherit (buildPackages.freebsd) makeMinimal install gencat rpcgen; - inherit (self) csu include; - }; - - libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { - inherit (buildPackages.freebsd) makeMinimal; - }; - - mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { - inherit stdenv; - inherit (buildPackages.freebsd) makeMinimal install tsort; - }; - - makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { - inherit (self) make; - }; - - }); +in +{ + freebsd = callFreeBSDWithAttrs { }; + freebsdCross = callFreeBSDWithAttrs { stdenv = crossLibcStdenv; }; } diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix new file mode 100644 index 0000000000000..609b3f45b51e6 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -0,0 +1,71 @@ +{ stdenv, lib, stdenvNoCC +, fetchzip +, sourceData, versionData, buildFreebsd, patchesRoot +}: + +self: + +lib.packagesFromDirectoryRecursive { + callPackage = self.callPackage; + directory = ./pkgs; +} // { + inherit sourceData patchesRoot versionData; + + # Keep the crawled portion of Nixpkgs finite. + buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd; + + ports = fetchzip { + url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; + sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; + }; + + compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat; + freebsd-lib = import ./lib { + version = lib.concatStringsSep "." (map toString (lib.filter (x: x != null) [ + self.versionData.major + self.versionData.minor + self.versionData.patch or null + ])); + }; + + # The manual callPackages below should in principle be unnecessary, but are + # necessary. See note in ../netbsd/default.nix + + compat = self.callPackage ./pkgs/compat/package.nix { + inherit stdenv; + inherit (buildFreebsd) makeMinimal boot-install; + }; + + csu = self.callPackage ./pkgs/csu.nix { + inherit (buildFreebsd) makeMinimal install gencat; + inherit (self) include; + }; + + include = self.callPackage ./pkgs/include/package.nix { + inherit (buildFreebsd) makeMinimal install rpcgen; + }; + + install = self.callPackage ./pkgs/install.nix { + inherit (buildFreebsd) makeMinimal; + inherit (self) mtree libnetbsd; + }; + + libc = self.callPackage ./pkgs/libc/package.nix { + inherit (buildFreebsd) makeMinimal install gencat rpcgen; + inherit (self) csu include; + }; + + libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { + inherit (buildFreebsd) makeMinimal; + }; + + mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { + inherit stdenv; + inherit (buildFreebsd) makeMinimal install tsort; + }; + + makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { + inherit (self) make; + }; + +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-fix-typedefs-locations.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-fix-typedefs-locations.patch index 3336a2504e584..3336a2504e584 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-fix-typedefs-locations.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-fix-typedefs-locations.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch index 9bb2bea32ee98..9bb2bea32ee98 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-install-dirs.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-msun-arch-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-msun-arch-subdir.patch index 4a69e85a986a0..4a69e85a986a0 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-msun-arch-subdir.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-msun-arch-subdir.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-no-force--lcompiler-rt.patch index 60176fb73cf76..60176fb73cf76 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-no-force--lcompiler-rt.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-no-force--lcompiler-rt.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/libnetbsd-do-install.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/libnetbsd-do-install.patch index a7bd032d2be54..a7bd032d2be54 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/libnetbsd-do-install.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/libnetbsd-do-install.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/librpcsvc-include-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/librpcsvc-include-subdir.patch index 38e06682869fb..38e06682869fb 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/librpcsvc-include-subdir.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/librpcsvc-include-subdir.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/include/no-perms-BSD.include.dist.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/no-perms-BSD.include.dist.patch index 985617ee0f457..985617ee0f457 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/include/no-perms-BSD.include.dist.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/no-perms-BSD.include.dist.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/rpcgen-glibc-hack.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/rpcgen-glibc-hack.patch index 3dde1a0106514..3dde1a0106514 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/rpcgen-glibc-hack.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/rpcgen-glibc-hack.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-gnu-date.patch index 2356446baf853..2356446baf853 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-gnu-date.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-gnu-date.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-no-explicit-intrinsics-dep.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-no-explicit-intrinsics-dep.patch index edf44de5bb0d7..edf44de5bb0d7 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-no-explicit-intrinsics-dep.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-no-explicit-intrinsics-dep.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix index 5e4528fbf46a1..d31e3b05427bb 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation +{ lib, stdenv, mkDerivation, patchesRoot , bsdSetupHook, freebsdSetupHook , makeMinimal, boot-install , which @@ -85,8 +85,8 @@ mkDerivation rec { ]; patches = [ - ./compat-install-dirs.patch - ./compat-fix-typedefs-locations.patch + /${patchesRoot}/compat-install-dirs.patch + /${patchesRoot}/compat-fix-typedefs-locations.patch ]; preBuild = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix index 73fa887c51231..5c6f3ac4a16b6 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation +{ lib, mkDerivation, patchesRoot , buildPackages , bsdSetupHook, freebsdSetupHook , makeMinimal @@ -26,7 +26,7 @@ mkDerivation { ]; patches = [ - ./no-perms-BSD.include.dist.patch + /${patchesRoot}/no-perms-BSD.include.dist.patch ]; # The makefiles define INCSDIR per subdirectory, so we have to set diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix index 0225d44be4c3b..935b48cca5e72 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix @@ -1,4 +1,5 @@ { lib, stdenv, mkDerivation +, patchesRoot , bsdSetupHook, freebsdSetupHook , makeMinimal @@ -48,13 +49,13 @@ mkDerivation rec { patches = [ # Hack around broken propogating MAKEFLAGS to submake, just inline logic - ./libc-msun-arch-subdir.patch + /${patchesRoot}/libc-msun-arch-subdir.patch # Don't force -lcompiler-rt, we don't actually call it that - ./libc-no-force--lcompiler-rt.patch + /${patchesRoot}/libc-no-force--lcompiler-rt.patch # Fix extra include dir to get rpcsvc headers. - ./librpcsvc-include-subdir.patch + /${patchesRoot}/librpcsvc-include-subdir.patch ]; postPatch = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix index 4011e4d8a6490..0deea8b2fb7b8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix @@ -1,5 +1,5 @@ { lib, stdenv -, mkDerivation +, mkDerivation, patchesRoot , bsdSetupHook, freebsdSetupHook, makeMinimal, mandoc, groff , boot-install, install , compatIfNeeded @@ -15,8 +15,8 @@ mkDerivation { else install) ]; patches = lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ - ./libnetbsd-do-install.patch - #./libnetbsd-define-__va_list.patch + /${patchesRoot}/libnetbsd-do-install.patch + #/${patchesRoot}/libnetbsd-define-__va_list.patch ]; makeFlags = [ "STRIP=-s" # flag to install, not command diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix index 56141255af5e1..c2e64cb36601f 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, stdenv }: +{ lib, mkDerivation, stdenv, patchesRoot }: mkDerivation rec { path = "usr.bin/rpcgen"; @@ -12,11 +12,11 @@ mkDerivation rec { # those headers ends up included other headers...which ends up # including the other one, this means by the first time we reach # `#include `<bits/waitflags.h>`, both `_SYS_WAIT_H` and - # `_STDLIB_H` are already defined! Thus, we never ned up including + # `_STDLIB_H` are already defined! Thus, we never end up including # `<bits/waitflags.h>` and defining `WUNTRACED`. # # This hacks around this by manually including `WUNTRACED` until # the problem is fixed properly in glibc. - ./rpcgen-glibc-hack.patch + /${patchesRoot}/rpcgen-glibc-hack.patch ]; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index 81cf4114e8737..ab0edbabceab9 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, freebsd-lib +{ stdenv, mkDerivation, freebsd-lib, patchesRoot , buildPackages , bsdSetupHook, freebsdSetupHook , makeMinimal, install, mandoc, groff @@ -19,8 +19,8 @@ in rec { ]; patches = [ - ./sys-gnu-date.patch - ./sys-no-explicit-intrinsics-dep.patch + /${patchesRoot}/sys-gnu-date.patch + /${patchesRoot}/sys-no-explicit-intrinsics-dep.patch ]; # --dynamic-linker /red/herring is used when building the kernel. diff --git a/pkgs/os-specific/bsd/freebsd/update.py b/pkgs/os-specific/bsd/freebsd/update.py index cd20f67148fa7..533a871a4b04d 100755 --- a/pkgs/os-specific/bsd/freebsd/update.py +++ b/pkgs/os-specific/bsd/freebsd/update.py @@ -16,6 +16,7 @@ import typing import urllib.request _QUERY_VERSION_PATTERN = re.compile('^([A-Z]+)="(.+)"$') +_RELEASE_PATCH_PATTERN = re.compile('^RELEASE-p([0-9]+)$') BASE_DIR = os.path.dirname(os.path.abspath(__file__)) MIN_VERSION = packaging.version.Version("13.0.0") MAIN_BRANCH = "main" @@ -60,7 +61,16 @@ def query_version(repo: git.Repo) -> dict[str, typing.Any]: continue fields[m[1].lower()] = m[2] - fields["major"] = packaging.version.parse(fields["revision"]).major + parsed = packaging.version.parse(fields["revision"]) + fields["major"] = parsed.major + fields["minor"] = parsed.minor + + # Extract the patch number from `RELAESE-p<patch>`, which is used + # e.g. in the "releng" branches. + m = _RELEASE_PATCH_PATTERN.match(fields["branch"]) + if m is not None: + fields["patch"] = m[1] + return fields @@ -95,7 +105,7 @@ def handle_commit( "ref": ref_name, "refType": ref_type, "supported": ref_name in supported_refs, - "version": query_version(repo), + "version": version, } @@ -151,6 +161,14 @@ def main() -> None: result = handle_commit( repo, tag.commit, tag.name, "tag", supported_refs, old_versions ) + + # Hack in the patch version from parsing the tag, if we didn't + # get one from the "branch" field (from newvers). This is + # probably 0. + versionObj = result["version"] + if "patch" not in versionObj: + versionObj["patch"] = version.micro + versions[tag.name] = result for branch in repo.remote("origin").refs: diff --git a/pkgs/os-specific/bsd/freebsd/versions.json b/pkgs/os-specific/bsd/freebsd/versions.json index 736c4c3a3e3c1..3f781b4eeaf23 100644 --- a/pkgs/os-specific/bsd/freebsd/versions.json +++ b/pkgs/os-specific/bsd/freebsd/versions.json @@ -1,14 +1,15 @@ { "main": { - "hash": "sha256-C5ucT9BK/eK8a9HNSDDi8S1uhpPmiqV22XEooxAqbPw=", + "hash": "sha256-3aUsD2yRqVvb12z2XPmhE5/u4d9bqyD2ZHH3xNmwYwU=", "ref": "main", "refType": "branch", - "rev": "125c4560bc70971b950d035cfcd2255b89984011", + "rev": "aa34b1d20e44141749ffdecf16908fc1e5db4db6", "supported": false, "version": { "branch": "CURRENT", "major": 15, - "reldate": "1500017", + "minor": 0, + "reldate": "1500018", "release": "15.0-CURRENT", "revision": "15.0", "type": "FreeBSD", @@ -24,6 +25,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 0, + "patch": 0, "reldate": "1300139", "release": "13.0-RELEASE", "revision": "13.0", @@ -40,6 +43,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 1, + "patch": 0, "reldate": "1301000", "release": "13.1-RELEASE", "revision": "13.1", @@ -56,6 +61,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 2, + "patch": 0, "reldate": "1302001", "release": "13.2-RELEASE", "revision": "13.2", @@ -72,6 +79,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 3, + "patch": 0, "reldate": "1303001", "release": "13.3-RELEASE", "revision": "13.3", @@ -88,6 +97,8 @@ "version": { "branch": "RELEASE", "major": 14, + "minor": 0, + "patch": 0, "reldate": "1400097", "release": "14.0-RELEASE", "revision": "14.0", @@ -104,6 +115,8 @@ "version": { "branch": "RELEASE-p13", "major": 13, + "minor": 0, + "patch": "13", "reldate": "1300139", "release": "13.0-RELEASE-p13", "revision": "13.0", @@ -120,6 +133,8 @@ "version": { "branch": "RELEASE-p9", "major": 13, + "minor": 1, + "patch": "9", "reldate": "1301000", "release": "13.1-RELEASE-p9", "revision": "13.1", @@ -136,6 +151,8 @@ "version": { "branch": "RELEASE-p11", "major": 13, + "minor": 2, + "patch": "11", "reldate": "1302001", "release": "13.2-RELEASE-p11", "revision": "13.2", @@ -144,19 +161,21 @@ } }, "releng/13.3": { - "hash": "sha256-huzUiMZHfyK/mgLD3hW+DaSGgAaTUIuM51xDp+IE3qE=", + "hash": "sha256-g3i9q9XihesdfQxGy3oC7IMGtbWaLNwFlNzbdvS/4ng=", "ref": "releng/13.3", "refType": "branch", - "rev": "7a0d63c9093222938f26cd63ff742e555168de77", + "rev": "be4f1894ef399f421bab451e8cf8557e27e5a948", "supported": true, "version": { - "branch": "RELEASE-p1", + "branch": "RELEASE-p2", "major": 13, + "minor": 3, + "patch": "2", "reldate": "1303001", - "release": "13.3-RELEASE-p1", + "release": "13.3-RELEASE-p2", "revision": "13.3", "type": "FreeBSD", - "version": "FreeBSD 13.3-RELEASE-p1" + "version": "FreeBSD 13.3-RELEASE-p2" } }, "releng/14.0": { @@ -168,6 +187,8 @@ "version": { "branch": "RELEASE-p6", "major": 14, + "minor": 0, + "patch": "6", "reldate": "1400097", "release": "14.0-RELEASE-p6", "revision": "14.0", @@ -176,15 +197,16 @@ } }, "stable/13": { - "hash": "sha256-XateLKKs2A/HCP9Lx/nBm1cybB3otrbeXQvyCL40S0M=", + "hash": "sha256-ItC8haDdxMSZt1thpCrn8p0xxvs7Uqh/uNo1OwMalj8=", "ref": "stable/13", "refType": "branch", - "rev": "e0a58ef24a3baf5ed4cc09a798b9fe2d85408052", + "rev": "825cb4c850f2b97cfd1b24ed421d7938bf37eee7", "supported": true, "version": { "branch": "STABLE", "major": 13, - "reldate": "1303502", + "minor": 3, + "reldate": "1303503", "release": "13.3-STABLE", "revision": "13.3", "type": "FreeBSD", @@ -192,19 +214,20 @@ } }, "stable/14": { - "hash": "sha256-tIKnK/SYBDk9UnE5AfhjeDpqHnzspYbor0678ye/mrs=", + "hash": "sha256-iAj75IXJi4Oium6BqFvsyQipDP2crBZIGg0Dac8Zf1g=", "ref": "stable/14", "refType": "branch", - "rev": "ab872ab0bf195e872ed8d955aab3b2a537a230cd", + "rev": "a3b8266f5420601e231bc08c5402d9a4929fbdc0", "supported": true, "version": { - "branch": "STABLE", + "branch": "PRERELEASE", "major": 14, - "reldate": "1400510", - "release": "14.0-STABLE", - "revision": "14.0", + "minor": 1, + "reldate": "1400511", + "release": "14.1-PRERELEASE", + "revision": "14.1", "type": "FreeBSD", - "version": "FreeBSD 14.0-STABLE" + "version": "FreeBSD 14.1-PRERELEASE" } } } diff --git a/pkgs/os-specific/linux/rtl8852au/default.nix b/pkgs/os-specific/linux/rtl8852au/default.nix index d154fbe86a208..e7b682893f855 100644 --- a/pkgs/os-specific/linux/rtl8852au/default.nix +++ b/pkgs/os-specific/linux/rtl8852au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8852au"; - version = "${kernel.version}-unstable-2023-11-24"; + version = "${kernel.version}-unstable-2024-04-16"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtl8852au"; - rev = "70bdde265b9ab002daf11d4bea1a42baa8da4325"; - hash = "sha256-6ARS7/0iKYajpMH+f+jWDxIkPY9ZixJkk864oKom4l4="; + rev = "5894bc6fed2bcaa525d13fcee1edada8aba67f2b"; + hash = "sha256-R4Yb/jbh3nMgM41ByFjtkCMbsh/mmMRJ7CcvCRUvKu8="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 0d6b3ccd515ca..553e471faaffa 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -12,12 +12,12 @@ let pname = "uhk-agent"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-yx5hOmb1la+vNh8x0PM3edcMn4ojdwzNmGBUg/BH7wE="; + sha256 = "sha256-5VzUSuq+yc8HXSILMg24w/hbwasf4jq0H0wte9Mw+nY="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 321a37ec521d6..65379131afcc2 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dgraph"; - version = "23.1.0"; + version = "23.1.1"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-AC/5ykNH2eb6IrZ3KlU0DTP4r8RiHE5iUZFCUn6H2cw="; + sha256 = "sha256-xmWFRqdGUk+9MKd9cQLquOmike3soNRgPwQ+F27MSAQ="; }; vendorHash = "sha256-YRfFRCCm25zS+tQer6UcrBBltOxA7+Iqi+Ejyrjdu/A="; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 395ac3609514e..1af34b50df0f5 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-h71YX8mP9iB92gK+QQD/xl1JLZwKspAwE6D3wq+SOkU="; + sha256 = "sha256-kO4d7O3jRYUJwJnMleGV+Esx9suFVS0HkNAtGyQORKo="; }; # don't do anything? diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 186956baa9ff9..b6b6ef4b63bb2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.4.4"; + version = "2024.5.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -65,9 +65,6 @@ ]; "airthings_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly airthings-ble @@ -122,9 +119,6 @@ "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyturbojpeg ]; "alpha_vantage" = ps: with ps; [ @@ -137,11 +131,11 @@ amberelectric ]; "ambiclimate" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ambiclimate ]; + "ambient_network" = ps: with ps; [ + aioambient + ]; "ambient_station" = ps: with ps; [ aioambient ]; @@ -155,9 +149,6 @@ asmog ]; "analytics" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -200,16 +191,10 @@ aioapcaccess ]; "api" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "appalachianpower" = ps: with ps; [ ]; "apple_tv" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -218,9 +203,6 @@ zeroconf ]; "application_credentials" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -242,9 +224,6 @@ ]; "aranet" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly aranet4 @@ -281,19 +260,15 @@ "aruba" = ps: with ps; [ pexpect ]; + "arve" = ps: with ps; [ + ]; # missing inputs: asyncarve "arwn" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "aseko_pool_live" = ps: with ps; [ aioaseko ]; "assist_pipeline" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ha-ffmpeg hassil home-assistant-intents @@ -337,14 +312,8 @@ pyaussiebb ]; "auth" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "automation" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "avea" = ps: with ps; [ avea @@ -359,9 +328,6 @@ aiobotocore ]; "axis" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng axis paho-mqtt ]; @@ -375,9 +341,6 @@ azure-servicebus ]; "backup" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant securetar @@ -434,9 +397,6 @@ ]; "bluemaestro" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -468,9 +428,6 @@ xmltodict ]; "bluetooth" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bleak bleak-retry-connector bluetooth-adapters @@ -486,9 +443,6 @@ ]; "bluetooth_adapters" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -515,9 +469,6 @@ ]; "bluetooth_le_tracker" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -554,9 +505,6 @@ bond-async ]; "bosch_shc" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng boschshcpy fnv-hash-fast ifaddr @@ -600,9 +548,6 @@ ]; "bthome" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -641,14 +586,8 @@ caldav ]; "calendar" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "camera" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyturbojpeg ]; "canary" = ps: with ps; [ @@ -656,9 +595,6 @@ py-canary ]; "cast" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -706,9 +642,6 @@ "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -756,9 +689,6 @@ "coned" = ps: with ps; [ ]; "config" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "configurator" = ps: with ps; [ ]; @@ -766,9 +696,6 @@ pycontrol4 ]; "conversation" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -789,9 +716,6 @@ "cribl" = ps: with ps; [ ]; "crownstone" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng crownstone-cloud crownstone-sse crownstone-uart @@ -837,9 +761,6 @@ "default_config" = ps: with ps; [ aiodhcpwatcher aiodiscover - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client bleak bleak-retry-connector @@ -880,9 +801,6 @@ deluge-client ]; "demo" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -894,9 +812,6 @@ "derivative" = ps: with ps; [ ]; "devialet" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng devialet fnv-hash-fast ifaddr @@ -907,17 +822,11 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pillow ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng devolo-home-control-api fnv-hash-fast ifaddr @@ -937,14 +846,8 @@ cached-ipaddress ]; "diagnostics" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "dialogflow" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "diaz" = ps: with ps; [ ]; @@ -974,9 +877,6 @@ "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 "dlna_dmr" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -985,9 +885,6 @@ sqlalchemy ]; "dlna_dms" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -998,27 +895,18 @@ aiodns ]; "dominos" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow pydoods ]; "doorbird" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng doorbirdpy ]; "dooya" = ps: with ps; [ ]; "dormakaba_dkey" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -1052,9 +940,6 @@ dremel3dpy ]; "drop_connect" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng dropmqttapi paho-mqtt ]; @@ -1062,9 +947,6 @@ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ @@ -1087,9 +969,6 @@ "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng dynalite-devices dynalite-panel fnv-hash-fast @@ -1127,9 +1006,6 @@ ]; # missing inputs: py-sucks "ecowitt" = ps: with ps; [ aioecowitt - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "eddystone_temperature" = ps: with ps; [ ]; # missing inputs: beacontools @@ -1150,9 +1026,6 @@ "electrasmart" = ps: with ps; [ ]; # missing inputs: pyElectra "electric_kiwi" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1164,9 +1037,6 @@ eliqonline ]; "elkm1" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng elkm1-lib fnv-hash-fast ifaddr @@ -1180,9 +1050,6 @@ pypca ]; "elvia" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1198,9 +1065,6 @@ aioemonitor ]; "emulated_hue" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -1210,21 +1074,17 @@ sense-energy ]; "emulated_roku" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng emulated-roku fnv-hash-fast ifaddr psutil-home-assistant sqlalchemy ]; + "energenie_power_sockets" = ps: with ps; [ + ]; # missing inputs: pyegps "energie_vanons" = ps: with ps; [ ]; "energy" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1255,14 +1115,40 @@ "ephember" = ps: with ps; [ pyephember ]; + "epic_games_store" = ps: with ps; [ + ]; # missing inputs: epicstore-api "epion" = ps: with ps; [ epion ]; "epson" = ps: with ps; [ epson-projector ]; - "epsonworkforce" = ps: with ps; [ - ]; # missing inputs: epsonprinter + "eq3btsmart" = ps: with ps; [ + aioesphomeapi + aioruuvigateway + aioshelly + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: eq3btsmart "escea" = ps: with ps; [ pescea ]; @@ -1270,9 +1156,6 @@ ]; "esphome" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bleak bleak-esphome bleak-retry-connector @@ -1302,9 +1185,6 @@ ]; "eufylife_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -1383,16 +1263,10 @@ file-read-backwards ]; "file_upload" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1409,9 +1283,6 @@ pymata-express ]; "fitbit" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fitbit fnv-hash-fast psutil-home-assistant @@ -1425,9 +1296,6 @@ ]; "fjaraskupan" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -1483,9 +1351,6 @@ "flux" = ps: with ps; [ ]; "flux_led" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng flux-led fnv-hash-fast ifaddr @@ -1504,9 +1369,6 @@ forecast-solar ]; "forked_daapd" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -1519,9 +1381,6 @@ libpyfoscam ]; "foursquare" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -1535,9 +1394,6 @@ pyfreedompro ]; "fritz" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast fritzconnection ifaddr @@ -1557,9 +1413,6 @@ pyfronius ]; "frontend" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend pillow @@ -1572,9 +1425,6 @@ "fujitsu_anywair" = ps: with ps; [ ]; "fully_kiosk" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt python-fullykiosk ]; @@ -1591,9 +1441,6 @@ ]; "gardena_bluetooth" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -1627,18 +1474,12 @@ aio-georss-gdacs ]; "generic" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ha-av pillow ]; "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1655,18 +1496,12 @@ georss-generic-client ]; "geocaching" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast geocachingapi psutil-home-assistant sqlalchemy ]; "geofency" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes @@ -1698,9 +1533,6 @@ goodwe ]; "google" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast gcal-sync ical @@ -1709,9 +1541,6 @@ sqlalchemy ]; "google_assistant" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant python-matter-server @@ -1719,9 +1548,6 @@ sqlalchemy ]; "google_assistant_sdk" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast gassist-text psutil-home-assistant @@ -1733,17 +1559,11 @@ "google_domains" = ps: with ps; [ ]; "google_generative_ai_conversation" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng google-generativeai hassil home-assistant-intents ]; "google_mail" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1756,18 +1576,12 @@ google-cloud-pubsub ]; "google_sheets" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast gspread psutil-home-assistant sqlalchemy ]; "google_tasks" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1783,9 +1597,6 @@ ]; "govee_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -1812,9 +1623,6 @@ zeroconf ]; "govee_light_local" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast govee-local-api ifaddr @@ -1825,16 +1633,10 @@ gps3 ]; "gpslogger" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast greeclimate ifaddr @@ -1863,9 +1665,6 @@ habitipy ]; "hardkernel" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1878,9 +1677,6 @@ aioharmony ]; "hassio" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "havana_shade" = ps: with ps; [ ]; @@ -1915,17 +1711,11 @@ pyaehw4a1 ]; "history" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy ]; "history_stats" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1945,9 +1735,6 @@ holidays ]; "home_connect" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast homeconnect psutil-home-assistant @@ -1960,9 +1747,6 @@ "homeassistant_alerts" = ps: with ps; [ ]; "homeassistant_green" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bellows fnv-hash-fast pillow @@ -1981,9 +1765,6 @@ zigpy-znp ]; "homeassistant_hardware" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bellows fnv-hash-fast pillow @@ -2002,9 +1783,6 @@ zigpy-znp ]; "homeassistant_sky_connect" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bellows fnv-hash-fast pillow @@ -2023,9 +1801,6 @@ zigpy-znp ]; "homeassistant_yellow" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bellows fnv-hash-fast pillow @@ -2044,9 +1819,6 @@ zigpy-znp ]; "homekit" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng base36 fnv-hash-fast ha-ffmpeg @@ -2061,9 +1833,6 @@ "homekit_controller" = ps: with ps; [ aioesphomeapi aiohomekit - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2111,15 +1880,9 @@ python-hpilo ]; "html5" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pywebpush ]; "http" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "huawei_lte" = ps: with ps; [ huawei-lte-api @@ -2141,9 +1904,6 @@ ]; "husqvarna_automower" = ps: with ps; [ aioautomower - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -2172,9 +1932,6 @@ ]; "ibeacon" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2205,9 +1962,6 @@ ]; "idasen_desk" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2235,9 +1989,6 @@ "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyfttt ]; "iglo" = ps: with ps; [ @@ -2249,33 +2000,18 @@ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "image_processing" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyturbojpeg ]; "image_upload" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pillow ]; "imap" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioimaplib ]; "improv_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2311,9 +2047,6 @@ ]; "inkbird" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2354,9 +2087,6 @@ "inspired_shades" = ps: with ps; [ ]; "insteon" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant @@ -2373,9 +2103,6 @@ intellifire4py ]; "intent" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "intent_script" = ps: with ps; [ ]; @@ -2383,9 +2110,6 @@ pyintesishome ]; "ios" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2409,8 +2133,7 @@ "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ - prayer-times-calculator - ]; + ]; # missing inputs: prayer-times-calculator-offline "ismartwindow" = ps: with ps; [ ]; "iss" = ps: with ps; [ @@ -2460,9 +2183,6 @@ ]; "kegtron" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2498,9 +2218,6 @@ ]; "keymitt_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2530,9 +2247,6 @@ pykira ]; "kitchen_sink" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -2544,9 +2258,6 @@ pykmtronic ]; "knx" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend knx-frontend @@ -2557,15 +2268,9 @@ xknxproject ]; "kodi" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pykodi ]; "konnected" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng konnected ]; "kostal_plenticore" = ps: with ps; [ @@ -2590,9 +2295,6 @@ ]; # missing inputs: lacrosse-view "lamarzocco" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2619,18 +2321,12 @@ zeroconf ]; "lametric" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng demetriek fnv-hash-fast psutil-home-assistant sqlalchemy ]; "landisgyr_heat_meter" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -2656,9 +2352,6 @@ ]; "ld2410_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2686,9 +2379,6 @@ ]; "leaone" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2715,9 +2405,6 @@ ]; # missing inputs: leaone-ble "led_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2746,7 +2433,11 @@ "legrand" = ps: with ps; [ ]; "lg_netcast" = ps: with ps; [ + fnv-hash-fast + ifaddr + psutil-home-assistant pylgnetcast + sqlalchemy ]; "lg_soundbar" = ps: with ps; [ temescal @@ -2757,9 +2448,6 @@ "life360" = ps: with ps; [ ]; "lifx" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aiolifx aiolifx-effects aiolifx-themes @@ -2807,9 +2495,6 @@ "local_file" = ps: with ps; [ ]; "local_ip" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2819,16 +2504,10 @@ ical ]; "locative" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend pillow @@ -2840,9 +2519,6 @@ "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ha-ffmpeg logi-circle ]; @@ -2854,9 +2530,6 @@ aiolookin ]; "loqed" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -2871,9 +2544,6 @@ webrtc-noise-gain ]; "lovelace" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pillow ]; "luci" = ps: with ps; [ @@ -2896,9 +2566,6 @@ "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aiolyric fnv-hash-fast psutil-home-assistant @@ -2907,28 +2574,16 @@ "madeco" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "mailgun" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pymailgunner ]; "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "map" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend pillow @@ -2949,9 +2604,6 @@ pillow ]; "matter" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant python-matter-server @@ -2967,9 +2619,6 @@ ]; "medcom_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -2995,20 +2644,11 @@ zeroconf ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng yt-dlp ]; "media_player" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "media_source" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "mediaroom" = ps: with ps; [ pymediaroom @@ -3020,9 +2660,6 @@ ]; # missing inputs: py-melissa-climate "melnor" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -3048,9 +2685,6 @@ zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "message_bird" = ps: with ps; [ messagebird @@ -3076,9 +2710,6 @@ "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "microbees" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -3086,21 +2717,12 @@ "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_detect" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_identify" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyturbojpeg ]; "mijndomein_energie" = ps: with ps; [ @@ -3124,9 +2746,6 @@ ]; "moat" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -3153,9 +2772,6 @@ zeroconf ]; "mobile_app" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -3176,9 +2792,6 @@ pymodbus ]; "modem_callerid" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast phone-modem psutil-home-assistant @@ -3201,9 +2814,6 @@ ]; "mopeka" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -3230,9 +2840,6 @@ zeroconf ]; "motion_blinds" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr motionblinds @@ -3241,9 +2848,6 @@ ]; "motionblinds_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -3269,9 +2873,6 @@ zeroconf ]; # missing inputs: motionblindsble "motioneye" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng motioneye-client ]; "motionmount" = ps: with ps; [ @@ -3281,33 +2882,18 @@ mpd2 ]; "mqtt" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "mqtt_json" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "mqtt_room" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "msteams" = ps: with ps; [ @@ -3323,9 +2909,6 @@ pymvglive ]; "my" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend pillow @@ -3335,25 +2918,16 @@ "myq" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ mbddns ]; "myuplink" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast myuplink psutil-home-assistant @@ -3372,9 +2946,6 @@ aionanoleaf ]; "neato" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pybotvac @@ -3387,9 +2958,6 @@ nessclient ]; "nest" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast google-nest-sdm ha-ffmpeg @@ -3397,9 +2965,6 @@ sqlalchemy ]; "netatmo" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -3423,14 +2988,8 @@ eternalegypt ]; "netio" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; # missing inputs: pynetio "network" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -3474,9 +3033,6 @@ pycarwings2 ]; "nmap_tracker" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aiooui fnv-hash-fast getmac @@ -3514,9 +3070,6 @@ nuheat ]; "nuki" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pynuki ]; "numato" = ps: with ps; [ @@ -3552,9 +3105,6 @@ defusedxml ]; "ollama" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng hassil home-assistant-intents ]; # missing inputs: ollama-hass @@ -3565,18 +3115,12 @@ omnilogic ]; "onboarding" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pillow ]; "oncue" = ps: with ps; [ aiooncue ]; "ondilo_ico" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ondilo ]; "onewire" = ps: with ps; [ @@ -3594,12 +3138,12 @@ open-meteo ]; "openai_conversation" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng + ha-ffmpeg hassil home-assistant-intents + mutagen openai + webrtc-noise-gain ]; "openalpr_cloud" = ps: with ps; [ ]; @@ -3639,9 +3183,6 @@ pyopnsense ]; "opower" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast opower psutil-home-assistant @@ -3651,9 +3192,6 @@ ]; # missing inputs: pyoppleio-legacy "oralb" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -3691,9 +3229,6 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otbr" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bellows fnv-hash-fast ifaddr @@ -3727,9 +3262,6 @@ ovoenergy ]; "owntracks" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -3757,9 +3289,6 @@ pexpect ]; "panel_custom" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend pillow @@ -3767,9 +3296,6 @@ sqlalchemy ]; "panel_iframe" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend pillow @@ -3796,9 +3322,6 @@ "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pillow ]; "pge" = ps: with ps; [ @@ -3826,9 +3349,6 @@ "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -3843,17 +3363,11 @@ webrtc-noise-gain ]; "plant" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy ]; "plex" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng plexapi plexauth plexwebsocket @@ -3867,9 +3381,6 @@ pycketcasts ]; "point" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pypoint ]; "poolsense" = ps: with ps; [ @@ -3882,9 +3393,6 @@ ]; "private_ble_device" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -3919,9 +3427,6 @@ "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng prometheus-client ]; "prosegur" = ps: with ps; [ @@ -3956,9 +3461,6 @@ aiopurpleair ]; "push" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "pushbullet" = ps: with ps; [ pushbullet-py @@ -3983,9 +3485,6 @@ ]; # missing inputs: python-qbittorrent "qingping" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4036,9 +3535,6 @@ pyqwikswitch ]; "rabbitair" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4047,9 +3543,6 @@ zeroconf ]; "rachio" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -4083,9 +3576,6 @@ eagle100 ]; "rainforest_raven" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioraven fnv-hash-fast psutil-home-assistant @@ -4100,9 +3590,6 @@ ]; "rapt_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4129,9 +3616,6 @@ zeroconf ]; "raspberry_pi" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -4145,17 +3629,11 @@ aiorecollect ]; "recorder" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy ]; "recovery_mode" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -4195,15 +3673,9 @@ renson-endura-delta ]; "reolink" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng reolink-aio ]; "repairs" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng @@ -4222,9 +3694,6 @@ pyrfxtrx ]; "rhasspy" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "ridwell" = ps: with ps; [ aioridwell @@ -4275,16 +3744,10 @@ rpi-bad-power ]; "rss_feed_template" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "rtorrent" = ps: with ps; [ ]; "rtsp_to_webrtc" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyturbojpeg rtsp-to-webrtc ]; @@ -4296,9 +3759,6 @@ "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "ruuvi_gateway" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway bleak bleak-retry-connector @@ -4315,9 +3775,6 @@ ]; "ruuvitag_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4354,9 +3811,6 @@ "samsam" = ps: with ps; [ ]; "samsungtv" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -4370,6 +3824,9 @@ ++ samsungctl.optional-dependencies.websocket ++ samsungtvws.optional-dependencies.async ++ samsungtvws.optional-dependencies.encrypted; + "sanix" = ps: with ps; [ + sanix + ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel-integra "scene" = ps: with ps; [ @@ -4399,9 +3856,6 @@ "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate "search" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4422,9 +3876,6 @@ ]; "sensirion_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4451,9 +3902,6 @@ zeroconf ]; "sensor" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4462,9 +3910,6 @@ ]; "sensorpro" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4492,9 +3937,6 @@ ]; "sensorpush" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4524,9 +3966,6 @@ sentry-sdk ]; "senz" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aiosenz fnv-hash-fast psutil-home-assistant @@ -4555,9 +3994,6 @@ "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioshelly bleak bleak-retry-connector @@ -4577,9 +4013,6 @@ shodan ]; "shopping_list" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "sia" = ps: with ps; [ pysiaalarm @@ -4632,18 +4065,12 @@ "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "slimproto" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioslimproto ]; "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pysmappee ]; "smart_blinds" = ps: with ps; [ @@ -4656,9 +4083,6 @@ "smarther" = ps: with ps; [ ]; "smartthings" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -4690,9 +4114,6 @@ snapcast ]; "snips" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng paho-mqtt ]; "snmp" = ps: with ps; [ @@ -4700,9 +4121,6 @@ ]; "snooz" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4729,9 +4147,8 @@ zeroconf ]; "solaredge" = ps: with ps; [ - solaredge stringcase - ]; + ]; # missing inputs: aiosolaredge "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ @@ -4755,9 +4172,6 @@ python-songpal ]; "sonos" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4778,9 +4192,6 @@ libsoundtouch ]; "spaceapi" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "spc" = ps: with ps; [ pyspcwebgw @@ -4794,9 +4205,6 @@ "splunk" = ps: with ps; [ ]; # missing inputs: hass-splunk "spotify" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -4813,9 +4221,6 @@ srpenergy ]; "ssdp" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4833,9 +4238,6 @@ xmltodict ]; "statistics" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4847,9 +4249,6 @@ steamodd ]; "steamist" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aiosteamist discovery30303 fnv-hash-fast @@ -4866,9 +4265,6 @@ "stookwijzer" = ps: with ps; [ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ha-av numpy pyturbojpeg @@ -4877,9 +4273,6 @@ streamlabswater ]; "stt" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "subaru" = ps: with ps; [ subarulink @@ -4918,9 +4311,6 @@ ]; "switchbot" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -4966,9 +4356,6 @@ "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng py-synologydsm-api ]; "synology_srm" = ps: with ps; [ @@ -4976,9 +4363,6 @@ "syslog" = ps: with ps; [ ]; "system_bridge" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4988,9 +4372,6 @@ zeroconf ]; "system_health" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "system_log" = ps: with ps; [ ]; @@ -5020,9 +4401,6 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng hatasmota paho-mqtt ]; @@ -5038,21 +4416,12 @@ xmltodict ]; "tedee" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pytedee-async ]; "telegram" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng python-telegram-bot ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "telegram_bot" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng python-telegram-bot ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "tellduslive" = ps: with ps; [ @@ -5087,9 +4456,6 @@ ]; # missing inputs: pytfiac "thermobeacon" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -5119,9 +4485,6 @@ ]; "thermopro" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -5159,9 +4522,6 @@ "thomson" = ps: with ps; [ ]; "thread" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5173,9 +4533,6 @@ "threshold" = ps: with ps; [ ]; "tibber" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pytibber @@ -5188,9 +4545,6 @@ ]; "tilt_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -5228,9 +4582,6 @@ "tod" = ps: with ps; [ ]; "todo" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "todoist" = ps: with ps; [ todoist-api-python @@ -5244,9 +4595,6 @@ pytomorrowio ]; "toon" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ha-ffmpeg hass-nabucasa @@ -5261,9 +4609,6 @@ webrtc-noise-gain ]; "torque" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "totalconnect" = ps: with ps; [ total-connect-client @@ -5271,9 +4616,6 @@ "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5289,9 +4631,6 @@ "tplink_tapo" = ps: with ps; [ ]; "traccar" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pytraccar stringcase ]; @@ -5331,9 +4670,6 @@ numpy ]; "tts" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ha-ffmpeg mutagen ]; @@ -5345,30 +4681,18 @@ twentemilieu ]; "twilio" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng twilio ]; "twilio_call" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng twilio ]; "twilio_sms" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng twilio ]; "twinkly" = ps: with ps; [ ttls ]; "twitch" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -5400,9 +4724,6 @@ unifiled ]; "unifiprotect" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng pyunifiprotect unifi-discovery ]; @@ -5420,9 +4741,6 @@ "update" = ps: with ps; [ ]; "upnp" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -5438,9 +4756,6 @@ pyuptimerobot ]; "usb" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -5470,9 +4785,6 @@ vtjp ]; "velbus" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -5529,9 +4841,6 @@ "voicerss" = ps: with ps; [ ]; "voip" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ha-ffmpeg hassil home-assistant-intents @@ -5590,9 +4899,6 @@ apple-weatherkit ]; "webhook" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ]; "webmin" = ps: with ps; [ ]; # missing inputs: webmin-xmlrpc @@ -5600,9 +4906,6 @@ aiowebostv ]; "websocket_api" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -5627,9 +4930,6 @@ "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aiowithings fnv-hash-fast ha-ffmpeg @@ -5644,9 +4944,6 @@ webrtc-noise-gain ]; "wiz" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5673,9 +4970,6 @@ "wsdot" = ps: with ps; [ ]; "wyoming" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng ha-ffmpeg hassil home-assistant-intents @@ -5686,9 +4980,6 @@ "x10" = ps: with ps; [ ]; "xbox" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -5705,9 +4996,6 @@ ]; "xiaomi_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -5754,9 +5042,6 @@ ]; "yalexs_ble" = ps: with ps; [ aioesphomeapi - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aioruuvigateway aioshelly bleak @@ -5786,9 +5071,6 @@ rxv ]; "yamaha_musiccast" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng aiomusiccast async-upnp-client fnv-hash-fast @@ -5805,9 +5087,6 @@ pyyardian ]; "yeelight" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -5822,9 +5101,6 @@ ha-ffmpeg ]; "yolink" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -5834,9 +5110,6 @@ youless-api ]; "youtube" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -5852,9 +5125,6 @@ bluepy ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5870,9 +5140,6 @@ "zeversolar" = ps: with ps; [ ]; # missing inputs: zeversolar "zha" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng bellows fnv-hash-fast pillow @@ -5904,9 +5171,6 @@ zm-py ]; "zwave_js" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -5915,9 +5179,6 @@ zwave-js-server-python ]; "zwave_me" = ps: with ps; [ - aiohttp-cors - aiohttp-fast-url-dispatcher - aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5957,6 +5218,7 @@ "alexa" "amberelectric" "ambiclimate" + "ambient_network" "ambient_station" "analytics" "analytics_insights" @@ -6101,6 +5363,7 @@ "emulated_roku" "energy" "energyzero" + "enigma2" "enocean" "enphase_envoy" "environment_canada" @@ -6263,7 +5526,6 @@ "ipma" "ipp" "iqvia" - "islamic_prayer_times" "isy994" "izone" "jellyfin" @@ -6293,6 +5555,7 @@ "lcn" "ld2410_ble" "led_ble" + "lg_netcast" "lg_soundbar" "lidarr" "life360" @@ -6515,6 +5778,7 @@ "ruuvitag_ble" "sabnzbd" "samsungtv" + "sanix" "scene" "schedule" "schlage" @@ -6556,12 +5820,12 @@ "smartthings" "smarttub" "smhi" + "sms" "smtp" "snapcast" "snips" "snmp" "snooz" - "solaredge" "solarlog" "solax" "soma" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 52bf366e74fff..d48e775ce0114 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -39,15 +39,6 @@ let }; }); - aioautomower = super.aioautomower.overridePythonAttrs (oldAttrs: rec { - version = "2024.3.4"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-dk8HfIiQOKq7Ky+vYa3wKmTS78gTw6J0yyQT2Folpp0="; - }; - }); - aioelectricitymaps = super.aioelectricitymaps.overridePythonAttrs (oldAttrs: rec { version = "0.4.0"; src = fetchFromGitHub { @@ -61,19 +52,14 @@ let ]; }); - aiogithubapi = super.aiogithubapi.overridePythonAttrs (oldAttrs: rec { - version = "22.10.1"; + aiolyric = super.aiolyric.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; src = fetchFromGitHub { - owner = "ludeeus"; - repo = "aiogithubapi"; + owner = "timmo001"; + repo = "aiolyric"; rev = "refs/tags/${version}"; - hash = "sha256-ceBuqaMqqL6qwN52765MG4sLt+08hx2G9rUVNC7x6ik="; + hash = "sha256-FZhLjVrLzLv6CZz/ROlvbtBK9XnpO8pG48aSIoBxhCo="; }; - propagatedBuildInputs = with self; [ - aiohttp - async-timeout - backoff - ]; }); aiopurpleair = super.aiopurpleair.overridePythonAttrs (oldAttrs: rec { @@ -293,17 +279,6 @@ let doCheck = false; # no tests }); - # Pinned due to API changes in 1.3.0 - ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { - version = "1.2.0"; - src = fetchFromGitHub { - owner = "timmo001"; - repo = "ovoenergy"; - rev = "refs/tags/v${version}"; - hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; - }; - }); - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -314,16 +289,6 @@ let }; }); - py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { - version = "2.1.4"; - src = fetchFromGitHub { - owner = "mib1185"; - repo = "py-synologydsm-api"; - rev = "refs/tags/v${version}"; - hash = "sha256-37JzdhMny6YDTBO9NRzfrZJAVAOPnpcr95fOKxisbTg="; - }; - }); - pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { version = "0.4.8"; src = fetchPypi { @@ -366,20 +331,6 @@ let }; }); - python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { - version = "0.40.0"; - src = fetchFromGitHub { - owner = "humbertogontijo"; - repo = "python-roborock"; - rev = "refs/tags/v${version}"; - hash = "sha256-H4xwgulNLs3R1Q5GhvQffpAZ1CWXZUJAja8BskW+YJk="; - }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "poetry-core==" "poetry-core>=" - ''; - }); - pytibber = super.pytibber.overridePythonAttrs (oldAttrs: rec { version = "0.28.2"; src = fetchFromGitHub { @@ -525,7 +476,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.4.4"; + hassVersion = "2024.5.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -543,16 +494,16 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-bZcrFtaO0S22M6Wt2otK8rCg+NhpXr+/yRFxi02QJJI="; + hash = "sha256-YtlelAfFC3fnw78lZIf5FtQifvtwb2ZjCrZgM2G7S5U="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-NyIBFpDstX1MEoLS9p7GXl/+V6xB2hklNf2LmNLUMQk="; + hash = "sha256-9BgfQCP+t4zvC+ZVI0IAlm2qFArqRjTb8974sY/SHUg="; }; - nativeBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ pythonRelaxDepsHook setuptools ]; @@ -592,16 +543,20 @@ in python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace tests/test_config.py --replace-fail '"/usr"' '"/build/media"' + substituteInPlace pyproject.toml --replace-fail "wheel~=0.43.0" wheel + sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml sed -i 's/wheel[~=]/wheel>/' pyproject.toml ''; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ # Only packages required in pyproject.toml + aiodns aiohttp aiohttp-cors aiohttp-fast-url-dispatcher - aiohttp-zlib-ng + aiohttp-isal + aiohttp-session astral async-interrupt atomicwrites-homeassistant @@ -613,8 +568,8 @@ in python.pkgs.buildPythonApplication rec { cryptography fnv-hash-fast hass-nabucasa - httpx home-assistant-bluetooth + httpx ifaddr jinja2 lru-dict @@ -623,8 +578,8 @@ in python.pkgs.buildPythonApplication rec { pillow pip psutil-home-assistant - pyopenssl pyjwt + pyopenssl python-slugify pyyaml requests @@ -666,6 +621,8 @@ in python.pkgs.buildPythonApplication rec { tomli # Sneakily imported in tests/conftest.py paho-mqtt + # Used in tests/non_packaged_scripts/test_alexa_locales.py + beautifulsoup4 ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" @@ -688,6 +645,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" # SystemError: PyThreadState_SetAsyncExc failed "--deselect=tests/helpers/test_template.py::test_template_timeout" + # AssertionError: assert 6 == 5 + "--deselect=tests/helpers/test_translation.py::test_caching" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index afa2c53ca3f7f..c6e3c210e41da 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240404.2"; + version = "20240501.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-xCpQHzfXXt9aOWWVGYtt9NYws//ZPjI/owXBQafb31k="; + hash = "sha256-W3EiDkm/Se63/Ph4HUSRj2pY+y/pyCqecs4azYcxsaw="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 744adc8b49739..e72240cd6b837 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.4.3"; + version = "2024.4.24"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,8 +29,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant"; repo = "intents-package"; - rev = "refs/tags/${version}"; - hash = "sha256-hcstD1qkngZAl/jKLez+4qDs/ZIandkVkY2jrvZqph8="; + # https://github.com/home-assistant/intents-package/issues/3 + rev = "a68176a189c3def87cb11ad39baacea2440ce668"; + hash = "sha256-SUIJWoA0ltg+bjYn4J5kvAk4Eh23uxEcdxonkTSV0m0="; fetchSubmodules = true; }; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index d31cf8104dbed..db00b6573f2db 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.4.4"; + version = "2024.5.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-BPmHorcyO6a7Ag7FQogkZYh2x3GoMRKiFh+9aSkjE7M="; + hash = "sha256-QQ9FDxYJokISYWOOm7uAdz7o0TYLJJQn0YZm5tIZRhQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index 3ec80a5075e08..caff85394f2ed 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ngircd"; - version = "26.1"; + version = "27"; src = fetchurl { url = "https://ngircd.barton.de/pub/ngircd/${pname}-${version}.tar.xz"; - sha256 = "sha256-VcFv0mAJ9vxqAH3076yHoC4SL2gGEs2hzibhehjYYlQ="; + sha256 = "sha256-aJeIAxndXi5zwckBlhNQn4jrW42qWCGjb7yj14XCR7g="; }; configureFlags = [ diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index dd072035f1f91..8158b2e23f57f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.2392"; + version = "0.21.2496"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-VI7OBOSSHMfuwic7Ruk5IgLacEopD3cW4S8ZrvIsRZpUNZ1jBnUL0QC5pV4AIqB+AEJFeWoClGiqURal0TRPKg=="; + hash = "sha512-lzyOnf1nCB/TgrAlqbfHNuxp+tV2PLCIS8t9yvQlOoCZsCHPCgcyX4jkT+3i68zmXqj5Tfvhvje0zk6rE/3BgA=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index cfc7ee8e53037..b8206c57c4903 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-ArGoSb4gL0Mpul9wQJWW0aaCpSgtBxqnEiv5wS1eIFY="; + hash = "sha256-Q43ru/n7cY1DIT/JJP1sTbnXcgtbIh16fTDL9eV0YDE="; }; - vendorHash = "sha256-FcUKlvIdXJ3fSvf02zZu4lYa6943s3l2LwFBQ/EqtyY="; + vendorHash = "sha256-WCb0DxicVuJDm52GidivQPZb09LvZqJmgR5BoK8iZ7s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index 4abd65235fab3..21dedaa1b70e0 100644 --- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "bitcoin-prometheus-exporter"; - version = "0.5.0"; + version = "0.7.0"; format = "other"; @@ -10,17 +10,12 @@ python3Packages.buildPythonApplication rec { owner = "jvstein"; repo = pname; rev = "v${version}"; - sha256 = "0l0j6dyb0vflh386z3g8srysay5sf47g5rg2f5xrkckv86rjr115"; + sha256 = "sha256-ZWr+bBNnRYzqjatOJ4jYGzvTyfheceY2UDvG4Juvo5I="; }; - patches = [ - # remove after update to new release - (fetchpatch { - name = "configurable-listening-address.patch"; - url = "https://patch-diff.githubusercontent.com/raw/jvstein/bitcoin-prometheus-exporter/pull/11.patch"; - sha256 = "0a2l8aqgprc1d5k8yg1gisn6imh9hzg6j0irid3pjvp5i5dcnhyq"; - }) - ]; + # Copying bitcoind-monitor.py is enough. + # The makefile builds docker containers. + dontBuild = true; propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ]; diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 42cb8e2e0db28..2f1e9a8049663 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zJCvjgymwFUDOl3ubrTdaX0KpzzR+fzUIiCkRmZNUOE="; + sha256 = "sha256-plrQPPclDaJiFHc1HNCk+bYiLO0fJX/HC/vTTO5eoy8="; }; subPackages = [ "cmd/${pname}" ]; @@ -17,7 +17,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-Wnn2KIz4XtdJ6JoYLkGnykgc+MLstHS7s8MegSAQbiQ="; + vendorHash = "sha256-6l8jNQu+vI2SLPvKxl1o0XkqYbFyehqkrT75hEjIH/c="; doCheck = true; meta = with lib; { diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index c290b81ef04e2..1dd054de46bcf 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.100.1"; + version = "1.101.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-OheW6sCn/yXgSrtUe1zqDGaH6G8HG4QRQhFznaZGvX0="; + sha256 = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 45a94eef2b3be..835a02efe60e8 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.4.0"; + version = "7.4.2"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-XpMLT6oBoZv7V69l7XLm7B/ioeNHSqKkl+4UAsMcYao="; + hash = "sha256-NrtxAqXs0tEsWeixaRWvWYFA6RJ0Z0m5kCZjgn3JpVU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index de407700bccd6..062ee7b67684a 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-heduuPx0lnbkB1c4tgbDO9wsGnyAzTPyW0ZEvYFwjd0="; - arm64-linux_hash = "sha256-vfy0pVIacnf0lW1VwUolbE/P+aBB9uQsm3enhGkjgXg="; - x64-osx_hash = "sha256-JW+9PRW1Wu+wu+QPh7INXkq87oRSuoOqNEqj0P2Stto="; + x64-linux_hash = "sha256-fJ+QFbyW7r9u1Do54+/apYo94JDErM9AtXiUN6fsH68="; + arm64-linux_hash = "sha256-9mDHlq4sB12tshbsMtYQx97RNkafJSr7Cjjgwbo8Q1o="; + x64-osx_hash = "sha256-DgZAyjotJtWyf75UKyP7zJzkjX6RF4lOhoPhjyve6yo="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.23.2506"; + version = "0.3.25.2515"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/search/qdrant/1.7.4-CVE-2024-3078.patch b/pkgs/servers/search/qdrant/1.7.4-CVE-2024-3078.patch deleted file mode 100644 index b12b438342878..0000000000000 --- a/pkgs/servers/search/qdrant/1.7.4-CVE-2024-3078.patch +++ /dev/null @@ -1,142 +0,0 @@ -Based on upstream 3ab5172e9c8f14fa1f7b24e7147eac74e2412b62 with minor -adjustments to apply to 1.7.4 - -diff --git a/lib/collection/src/collection/snapshots.rs b/lib/collection/src/collection/snapshots.rs -index e5a8be9c..ca48fb9e 100644 ---- a/lib/collection/src/collection/snapshots.rs -+++ b/lib/collection/src/collection/snapshots.rs -@@ -241,35 +241,35 @@ impl Collection { - .await - } - -+ /// Get full file path for a collection snapshot by name -+ /// -+ /// This enforces the file to be inside the snapshots directory - pub async fn get_snapshot_path(&self, snapshot_name: &str) -> CollectionResult<PathBuf> { -- let snapshot_path = self.snapshots_path.join(snapshot_name); -- -- let absolute_snapshot_path = -- snapshot_path -- .canonicalize() -- .map_err(|_| CollectionError::NotFound { -- what: format!("Snapshot {snapshot_name}"), -- })?; -- -- let absolute_snapshot_dir = -- self.snapshots_path -- .canonicalize() -- .map_err(|_| CollectionError::NotFound { -- what: format!("Snapshot directory: {}", self.snapshots_path.display()), -- })?; -+ let absolute_snapshot_dir = self.snapshots_path.canonicalize().map_err(|_| { -+ CollectionError::not_found(format!( -+ "Snapshot directory: {}", -+ self.snapshots_path.display() -+ )) -+ })?; -+ -+ let absolute_snapshot_path = absolute_snapshot_dir -+ .join(snapshot_name) -+ .canonicalize() -+ .map_err(|_| CollectionError::not_found(format!("Snapshot {snapshot_name}")))?; - - if !absolute_snapshot_path.starts_with(absolute_snapshot_dir) { -- return Err(CollectionError::NotFound { -- what: format!("Snapshot {snapshot_name}"), -- }); -+ return Err(CollectionError::not_found(format!( -+ "Snapshot {snapshot_name}" -+ ))); - } - -- if !snapshot_path.exists() { -- return Err(CollectionError::NotFound { -- what: format!("Snapshot {snapshot_name}"), -- }); -+ if !absolute_snapshot_path.exists() { -+ return Err(CollectionError::not_found(format!( -+ "Snapshot {snapshot_name}" -+ ))); - } -- Ok(snapshot_path) -+ -+ Ok(absolute_snapshot_path) - } - - pub async fn list_shard_snapshots( -diff --git a/lib/collection/src/operations/types.rs b/lib/collection/src/operations/types.rs -index afc38d0f..63eae16e 100644 ---- a/lib/collection/src/operations/types.rs -+++ b/lib/collection/src/operations/types.rs -@@ -906,6 +906,10 @@ impl CollectionError { - CollectionError::BadInput { description } - } - -+ pub fn not_found(what: impl Into<String>) -> CollectionError { -+ CollectionError::NotFound { what: what.into() } -+ } -+ - pub fn bad_request(description: String) -> CollectionError { - CollectionError::BadRequest { description } - } -diff --git a/lib/storage/src/content_manager/errors.rs b/lib/storage/src/content_manager/errors.rs -index 1ad8d413..4528e485 100644 ---- a/lib/storage/src/content_manager/errors.rs -+++ b/lib/storage/src/content_manager/errors.rs -@@ -46,6 +46,12 @@ impl StorageError { - } - } - -+ pub fn not_found(description: impl Into<String>) -> StorageError { -+ StorageError::NotFound { -+ description: description.into(), -+ } -+ } -+ - /// Used to override the `description` field of the resulting `StorageError` - pub fn from_inconsistent_shard_failure( - err: CollectionError, -diff --git a/lib/storage/src/content_manager/snapshots/mod.rs b/lib/storage/src/content_manager/snapshots/mod.rs -index 8a417377..9965006a 100644 ---- a/lib/storage/src/content_manager/snapshots/mod.rs -+++ b/lib/storage/src/content_manager/snapshots/mod.rs -@@ -24,17 +24,33 @@ pub struct SnapshotConfig { - pub collections_aliases: HashMap<String, String>, - } - -+/// Get full file path for a full snapshot by name -+/// -+/// This enforces the file to be inside the snapshots directory - pub async fn get_full_snapshot_path( - toc: &TableOfContent, - snapshot_name: &str, - ) -> Result<PathBuf, StorageError> { -- let snapshot_path = Path::new(toc.snapshots_path()).join(snapshot_name); -- if !snapshot_path.exists() { -- return Err(StorageError::NotFound { -- description: format!("Full storage snapshot {snapshot_name} not found"), -- }); -+ let snapshots_path = toc.snapshots_path(); -+ -+ let absolute_snapshot_dir = Path::new(snapshots_path) -+ .canonicalize() -+ .map_err(|_| StorageError::not_found(format!("Snapshot directory: {snapshots_path}")))?; -+ -+ let absolute_snapshot_path = absolute_snapshot_dir -+ .join(snapshot_name) -+ .canonicalize() -+ .map_err(|_| StorageError::not_found(format!("Snapshot {snapshot_name}")))?; -+ -+ if !absolute_snapshot_path.starts_with(absolute_snapshot_dir) { -+ return Err(StorageError::not_found(format!("Snapshot {snapshot_name}"))); - } -- Ok(snapshot_path) -+ -+ if !absolute_snapshot_path.exists() { -+ return Err(StorageError::not_found(format!("Snapshot {snapshot_name}"))); -+ } -+ -+ Ok(absolute_snapshot_path) - } - - pub async fn do_delete_full_snapshot( diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index bafcd96575f75..4cdac0d8b37c2 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", @@ -36,16 +36,15 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832782fac6ca7369a70c9ee9a20554623c5e51c76e190ad151780ebea1cf689" +checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212" dependencies = [ "actix-http", "actix-service", "actix-utils", "actix-web", - "askama_escape", - "bitflags 1.3.2", + "bitflags 2.4.1", "bytes", "derive_more", "futures-core", @@ -55,20 +54,21 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project-lite", + "v_htmlescape", ] [[package]] name = "actix-http" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" +checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-tls", "actix-utils", - "ahash 0.8.5", + "ahash", "base64 0.21.0", "bitflags 2.4.1", "brotli", @@ -78,8 +78,8 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", - "http", + "h2 0.3.26", + "http 0.2.9", "httparse", "httpdate", "itoa", @@ -94,7 +94,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.12.2+zstd.1.5.2", + "zstd 0.13.0", ] [[package]] @@ -142,7 +142,7 @@ dependencies = [ "parse-size", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -152,7 +152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" dependencies = [ "bytestring", - "http", + "http 0.2.9", "regex", "serde", "tracing", @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a70bd48b6604191a700372f60bdc997db560eff5e4d41a7f00664390b5228b38" +checksum = "d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f" dependencies = [ "actix-rt", "actix-service", @@ -209,11 +209,11 @@ dependencies = [ "futures-core", "impl-more", "pin-project-lite", + "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-util", "tracing", - "webpki-roots 0.25.2", ] [[package]] @@ -228,9 +228,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.4.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" +checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" dependencies = [ "actix-codec", "actix-http", @@ -242,7 +242,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash 0.8.5", + "ahash", "bytes", "bytestring", "cfg-if", @@ -280,17 +280,14 @@ dependencies = [ ] [[package]] -name = "actix-web-httpauth" -version = "0.8.1" +name = "actix-web-extras" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d613edf08a42ccc6864c941d30fe14e1b676a77d16f1dbadc1174d065a0a775" +checksum = "ef1dfa234e9b71ed142e54b26b4cc9e13ef4ac563cf1a2be810b0c3d057781ea" dependencies = [ - "actix-utils", "actix-web", - "base64 0.21.0", "futures-core", "futures-util", - "log", "pin-project-lite", ] @@ -344,33 +341,23 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom 0.2.11", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.5" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom 0.2.11", "once_cell", + "serde", "version_check", "zerocopy", ] [[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", ] @@ -419,9 +406,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -433,9 +420,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -473,22 +460,21 @@ checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "api" -version = "1.7.4" +version = "1.9.0" dependencies = [ "chrono", "common", - "env_logger", "log", "parking_lot", "prost 0.11.9", "prost-build 0.11.9", - "prost-types 0.11.9", + "prost-wkt-types", "rand 0.8.5", "schemars", "segment", @@ -499,7 +485,6 @@ dependencies = [ "tokio", "tonic", "tonic-build", - "tower", "tracing", "uuid", "validator", @@ -516,9 +501,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" @@ -536,12 +521,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "askama_escape" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" - -[[package]] name = "async-stream" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -564,22 +543,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", -] - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", + "syn 2.0.48", ] [[package]] @@ -590,13 +560,13 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "atomicwrites" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db" dependencies = [ - "rustix 0.38.21", + "rustix 0.38.31", "tempfile", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -616,9 +586,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "itoa", "matchit", "memchr", @@ -642,8 +612,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -678,6 +648,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + +[[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -694,23 +670,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.65.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", - "prettyplease 0.2.4", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -739,6 +714,18 @@ name = "bitflags" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[package]] +name = "bitpacking" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" +dependencies = [ + "crunchy", +] [[package]] name = "bitvec" @@ -806,15 +793,15 @@ checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" [[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.3.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -910,9 +897,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb924701d850fbf0331302e7f9715c04e494b4b9bebb38ac48bdd30924e1936" +checksum = "60dc1a562fc8cb53d552d371758a4ecd76d15cc7489d2b968529cd9cadcbd854" dependencies = [ "aho-corasick", "cow-utils", @@ -937,9 +924,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -947,7 +934,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-targets 0.52.0", ] [[package]] @@ -1009,9 +996,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -1019,33 +1006,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "codespan-reporting" @@ -1063,27 +1050,34 @@ version = "0.4.2" dependencies = [ "actix-web-validator", "api", + "approx", "arc-swap", "async-trait", "atomicwrites", + "bytes", "cancel", "chrono", "common", "criterion", "env_logger", + "fnv", "fs_extra", "futures", "hashring", + "indexmap 2.2.6", "indicatif", "io", - "itertools 0.12.0", + "issues", + "itertools 0.12.1", + "lazy_static", "log", "merge", - "num_cpus", "ordered-float 4.2.0", "parking_lot", "pprof", + "proptest", "rand 0.8.5", + "ringbuffer", "rmp-serde", "rstest", "schemars", @@ -1092,7 +1086,9 @@ dependencies = [ "serde", "serde_cbor", "serde_json", + "sha2", "sparse", + "strum", "tar", "tempfile", "thiserror", @@ -1100,7 +1096,6 @@ dependencies = [ "tokio", "tokio-util", "tonic", - "tower", "tracing", "url", "uuid", @@ -1128,18 +1123,25 @@ dependencies = [ name = "common" version = "0.0.0" dependencies = [ + "lazy_static", + "num_cpus", "ordered-float 4.2.0", + "semver", "serde", + "thiserror", + "thread-priority", + "tokio", "validator", ] [[package]] name = "config" -version = "0.13.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" dependencies = [ "async-trait", + "convert_case 0.6.0", "json5", "lazy_static", "nom", @@ -1148,7 +1150,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "toml", + "toml 0.8.9", "yaml-rust", ] @@ -1204,6 +1206,26 @@ dependencies = [ ] [[package]] +name = "const-random" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.11", + "once_cell", + "tiny-keccak", +] + +[[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1222,6 +1244,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] name = "cookie" version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1233,16 +1264,6 @@ dependencies = [ ] [[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] name = "core-foundation-sys" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1274,9 +1295,9 @@ dependencies = [ [[package]] name = "crc32c" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" dependencies = [ "rustc_version", ] @@ -1327,12 +1348,6 @@ dependencies = [ ] [[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] name = "crossbeam-channel" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1376,6 +1391,12 @@ dependencies = [ ] [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1387,9 +1408,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1399,9 +1420,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1470,8 +1491,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.32", + "strsim 0.10.0", + "syn 2.0.48", ] [[package]] @@ -1482,7 +1503,20 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -1500,7 +1534,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", @@ -1509,15 +1543,15 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.3.3" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a" +checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" [[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", @@ -1526,9 +1560,12 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.3.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] [[package]] name = "docopt" @@ -1539,7 +1576,7 @@ dependencies = [ "lazy_static", "regex", "serde", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -1560,9 +1597,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encode_unicode" @@ -1636,9 +1673,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[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", ] @@ -1653,16 +1690,26 @@ dependencies = [ ] [[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1682,31 +1729,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno" -version = "0.3.1" +name = "erased-serde" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", + "serde", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] 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 = "filetime" @@ -1740,9 +1785,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[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 0.7.1", @@ -1778,7 +1823,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -1798,12 +1843,12 @@ dependencies = [ [[package]] name = "fs4" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" +checksum = "21dabded2e32cd57ded879041205c60a4a4c4bab47bd0fd2fa8b01f30849f02b" dependencies = [ - "rustix 0.38.21", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] @@ -1832,9 +1877,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1847,9 +1892,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1857,15 +1902,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1874,32 +1919,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -1909,9 +1954,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1944,7 +1989,7 @@ dependencies = [ "libc", "log", "rustversion", - "windows", + "windows 0.48.0", ] [[package]] @@ -1958,10 +2003,21 @@ dependencies = [ ] [[package]] +name = "generic-tests" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeb39ec0dacc89541b6eced815ab9e97f6b7d44078628abb090c6437763fd050" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] name = "geo" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" +checksum = "f811f663912a69249fa620dcd2a005db7254529da2d8a0b23942e81f47084501" dependencies = [ "earcutr", "float_next_after", @@ -1976,9 +2032,9 @@ dependencies = [ [[package]] name = "geo-types" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" +checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61" dependencies = [ "approx", "num-traits", @@ -1997,9 +2053,9 @@ dependencies = [ [[package]] name = "geohash" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18b809b13fa4f1c9ccfd94179cc429021a3517856b5160422c3d810c1e8546" +checksum = "0fb94b1a65401d6cbf22958a9040aa364812c26674f841bee538b12c135db1e6" dependencies = [ "geo-types", "libm", @@ -2032,8 +2088,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2062,17 +2120,36 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.2", + "http 0.2.9", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -2087,9 +2164,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] @@ -2099,9 +2176,12 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] name = "hashbrown" @@ -2109,7 +2189,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.5", + "ahash", "allocator-api2", ] @@ -2137,22 +2217,25 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.16" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version", - "spin 0.9.8", "stable_deref_trait", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -2187,13 +2270,47 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-body" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2204,6 +2321,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] +name = "http-serde" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fb7239a6d49eda628c2dfdd7e982c59b0c3f0fb99ce45c4237f02a520030688" +dependencies = [ + "http 1.0.0", + "serde", +] + +[[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2231,9 +2358,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -2246,16 +2373,40 @@ dependencies = [ ] [[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ - "http", - "hyper", - "rustls", + "futures-util", + "http 1.0.0", + "hyper 1.2.0", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", + "tower-service", ] [[package]] @@ -2264,13 +2415,33 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.26", "pin-project-lite", "tokio", "tokio-io-timeout", ] [[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] name = "iana-time-zone" version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2345,19 +2516,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.1" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.2", + "serde", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2372,8 +2544,8 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abfb2e51b23c338595ae0b6bdaaa7a4a8b860b8d788a4331cb07b50fe5dea71b" dependencies = [ - "ahash 0.8.5", - "indexmap 2.0.1", + "ahash", + "indexmap 2.2.6", "is-terminal", "itoa", "log", @@ -2403,6 +2575,12 @@ dependencies = [ ] [[package]] +name = "inventory" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7" + +[[package]] name = "io" version = "0.0.0" dependencies = [ @@ -2426,9 +2604,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" +checksum = "a9febecd4aebbe9c7c23c8e536e966805fdf09944c8a915e7991ee51acb67087" dependencies = [ "bitflags 1.3.2", "libc", @@ -2464,6 +2642,27 @@ dependencies = [ ] [[package]] +name = "is_sorted" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357376465c37db3372ef6a00585d336ed3d0f11d4345eef77ebcb05865392b21" + +[[package]] +name = "issues" +version = "0.0.0" +dependencies = [ + "chrono", + "dashmap", + "http 1.0.0", + "http-serde", + "log", + "schemars", + "serde", + "serde_json", + "serial_test", +] + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2474,9 +2673,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -2513,9 +2712,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2532,6 +2731,21 @@ dependencies = [ ] [[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.0", + "js-sys", + "pem", + "ring 0.17.5", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] name = "language-tags" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2551,9 +2765,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -2573,9 +2787,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "librocksdb-sys" -version = "0.11.0+8.1.1" +version = "0.16.0+8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" +checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c" dependencies = [ "bindgen", "bzip2-sys", @@ -2598,9 +2812,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f567a47e47b5420908424de2c6c5e424e3cafe588d0146bd128c0f3755758a3" +checksum = "ca21f2ee3ca40e7f3ebbd568d041be1531c2c28dbf540e737aeba934ab53f330" dependencies = [ "anyhow", "bincode", @@ -2617,9 +2831,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f3e553d55ebe9881fa5e5de588b0a153456e93564d17dfbef498912caf63a2" +checksum = "34da125091f3b3a49351f418484a16cb2a23f6888cd53fe219edad19d263da5d" dependencies = [ "anyhow", "flate2", @@ -2628,9 +2842,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a2440cc156a4a911a174ec68203543d1efb10df3a700a59b6bf581e453c726" +checksum = "09d4b717a8a31b73a3cbd3552e0abda14e0c85d97dc8b911035342533defdbad" dependencies = [ "anyhow", "bincode", @@ -2645,9 +2859,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e077a410e61c962cb526f71b7effd62ffc607488a8f61869c937582d2ccb529b" +checksum = "98f4476c99cb4ffa54fbfc42953adf69ada7276cfbb594bce9829547de012058" dependencies = [ "anyhow", "flate2", @@ -2656,9 +2870,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f57491adf7b311a3ee87f5e4a36454df16a2ec73de4ef28b2106fac80bd782" +checksum = "a45b92f0ce331c2202c6cec3135e4bfce29525ab3bb97a613c27c8e0a29fa967" dependencies = [ "anyhow", "bincode", @@ -2676,9 +2890,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3476ec7748aebd2eb23d496ddfce5e7e0a5c031cffcd214451043e02d029f11" +checksum = "642dee52201852df209cb43423ff1ca4d161a329f5cdba049a7b5820118345f2" dependencies = [ "anyhow", "bincode", @@ -2697,9 +2911,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1c7576a02d5e4af2bf62de51790a01bc4b8bc0d0b6a6b86a46b157f5cb306d" +checksum = "325144b154e68159373e944d1cd7f67c6ff9965a2af41240a8e41732b3fdb3af" dependencies = [ "anyhow", "bincode", @@ -2718,9 +2932,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b713ecd5b827d7d448c3c5eb3c6d5899ecaf22cd17087599996349a02c76828d" +checksum = "b484a2f9964e7424264fda304beb6ff6ad883c347accfe1115e777dedef3661d" dependencies = [ "bincode", "byteorder", @@ -2735,9 +2949,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic-builder" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e545752f6487be87b572529ad594cb3b48d2ef20821516f598b2d152d23277b" +checksum = "b9413d4d9bf7af921f5ac64414a290c7ba81695e8ba08dd2f6c950b57c281a69" dependencies = [ "anyhow", "bincode", @@ -2755,12 +2969,11 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a2d4606a5a4da62ac4a3680ee884a75da7f0c892dc967fc9cb983ceba39a8f" +checksum = "9987c818462d51ca67e131e40f0386e25e8c557e195059b1257f95731561185d" dependencies = [ "bincode", - "byteorder", "lindera-core", "lindera-dictionary", "once_cell", @@ -2770,9 +2983,9 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388b1bdf81794b5d5b8057ce0321c58ff4b90d676b637948ccc7863ae2f43d28" +checksum = "0c379cf436b2627cd7d3498642e491eadbff9b3e01231c516ce9f9b1893ab7c3" dependencies = [ "bincode", "byteorder", @@ -2787,9 +3000,9 @@ dependencies = [ [[package]] name = "lindera-unidic-builder" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfa3e29a22c047da57fadd960ff674b720de15a1e2fb35b5ed67f3408afb469" +checksum = "601ec33b5174141396a7a4ca066278863840221fec32d0be19091e7fae91ed94" dependencies = [ "anyhow", "bincode", @@ -2828,15 +3041,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "litemap" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575d8a551c59104b4df91269921e5eab561aa1b77c618dac0414b5d44a4617de" +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" [[package]] name = "local-channel" @@ -2858,9 +3071,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" [[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", @@ -2869,15 +3082,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "loom" -version = "0.5.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +checksum = "7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175" dependencies = [ "cfg-if", "generator", @@ -2887,6 +3100,22 @@ dependencies = [ ] [[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2918,9 +3147,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a69c7c189ae418f83003da62820aca28d15a07725ce51fb924999335d622ff" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -2939,7 +3168,7 @@ name = "memory" version = "0.0.0" dependencies = [ "log", - "memmap2 0.9.2", + "memmap2 0.9.4", "parking_lot", "serde", ] @@ -3008,9 +3237,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3062,9 +3291,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -3090,14 +3319,31 @@ dependencies = [ ] [[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-cmp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa" + +[[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -3111,10 +3357,19 @@ dependencies = [ ] [[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3147,9 +3402,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -3177,12 +3432,12 @@ dependencies = [ [[package]] name = "ordered-multimap" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" dependencies = [ "dlv-list", - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -3203,18 +3458,18 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "backtrace", "cfg-if", "libc", "petgraph", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", "thread-id", - "windows-sys 0.42.0", + "windows-targets 0.48.0", ] [[package]] @@ -3259,10 +3514,14 @@ dependencies = [ ] [[package]] -name = "peeking_take_while" -version = "0.1.2" +name = "pem" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +dependencies = [ + "base64 0.21.0", + "serde", +] [[package]] name = "percent-encoding" @@ -3406,9 +3665,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pinyin" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd12336e3afa34152e002f57df37a7056778daa59ea542b3473b87f5fb260c4" +checksum = "16f2611cd06a1ac239a0cea4521de9eb068a6ca110324ee00631aa68daa74fc0" [[package]] name = "pkg-config" @@ -3498,7 +3757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -3527,9 +3786,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -3544,7 +3803,7 @@ dependencies = [ "hex", "lazy_static", "procfs-core", - "rustix 0.38.21", + "rustix 0.38.31", ] [[package]] @@ -3603,12 +3862,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8473a65b88506c106c28ae905ca4a2b83a2993640467a41bb3080627ddfd2c" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive 0.12.0", + "prost-derive 0.12.3", ] [[package]] @@ -3618,7 +3877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", @@ -3637,22 +3896,22 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "log", "multimap", "once_cell", "petgraph", "prettyplease 0.2.4", - "prost 0.12.0", - "prost-types 0.12.0", + "prost 0.12.3", + "prost-types 0.12.3", "regex", - "syn 2.0.32", + "syn 2.0.48", "tempfile", "which", ] @@ -3672,15 +3931,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.10.5", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -3694,11 +3953,57 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.0" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +dependencies = [ + "prost 0.12.3", +] + +[[package]] +name = "prost-wkt" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562788060bcf2bfabe055194bd991ed2442457661744c88e0a0828ff9a08c08b" +dependencies = [ + "chrono", + "inventory", + "prost 0.11.9", + "serde", + "serde_derive", + "serde_json", + "typetag", +] + +[[package]] +name = "prost-wkt-build" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebe0a918c97f86c217b0f76fd754e966f8b9f41595095cf7d74cb4e59d730f6" +checksum = "c4dca8bcead3b728a6a7da017cc95e7f4cb2320ec4f6896bc593a1c4700f7328" dependencies = [ - "prost 0.12.0", + "heck 0.4.1", + "prost 0.11.9", + "prost-build 0.11.9", + "prost-types 0.11.9", + "quote", +] + +[[package]] +name = "prost-wkt-types" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2377c5680f2342871823045052e791b4487f7c90aae17e0feaee24cf59578a34" +dependencies = [ + "chrono", + "prost 0.11.9", + "prost-build 0.11.9", + "prost-types 0.11.9", + "prost-wkt", + "prost-wkt-build", + "regex", + "serde", + "serde_derive", + "serde_json", ] [[package]] @@ -3742,13 +4047,13 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.7.4" +version = "1.9.0" dependencies = [ "actix-cors", "actix-files", "actix-multipart", "actix-web", - "actix-web-httpauth", + "actix-web-extras", "actix-web-validator", "anyhow", "api", @@ -3763,11 +4068,11 @@ dependencies = [ "constant_time_eq 0.3.0", "futures", "futures-util", - "itertools 0.12.0", + "issues", + "itertools 0.12.1", + "jsonwebtoken", "log", "memory", - "num-traits", - "num_cpus", "parking_lot", "prometheus", "prost 0.11.9", @@ -3776,8 +4081,9 @@ dependencies = [ "rand 0.8.5", "reqwest", "rstack-self", - "rustls", - "rustls-pemfile", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "rusty-hook", "schemars", "sealed_test", @@ -3788,7 +4094,6 @@ dependencies = [ "serde_urlencoded", "slog", "slog-stdlog", - "sparse", "storage", "sys-info", "tar", @@ -3812,7 +4117,7 @@ dependencies = [ [[package]] name = "quantization" version = "0.1.0" -source = "git+https://github.com/qdrant/quantization.git#939fdb627a8edcf92fd71e3c79017156690850e9" +source = "git+https://github.com/qdrant/quantization.git#14f42f944358b4e95c482892dc4ead019809a448" dependencies = [ "cc", "permutation_iterator", @@ -3839,9 +4144,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3971,9 +4276,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3981,9 +4286,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4053,20 +4358,22 @@ checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" dependencies = [ - "base64 0.21.0", + "base64 0.22.0", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.4.4", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4074,14 +4381,15 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-util", "tower-service", "url", @@ -4089,7 +4397,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -4132,6 +4440,12 @@ dependencies = [ ] [[package]] +name = "ringbuffer" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53" + +[[package]] name = "rmp" version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4161,9 +4475,9 @@ checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" [[package]] name = "rocksdb" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +checksum = "6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7" dependencies = [ "libc", "librocksdb-sys", @@ -4171,13 +4485,14 @@ dependencies = [ [[package]] name = "ron" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.0", + "bitflags 2.4.1", "serde", + "serde_derive", ] [[package]] @@ -4209,9 +4524,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008" dependencies = [ "heapless", "num-traits", @@ -4220,9 +4535,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" dependencies = [ "futures", "futures-timer", @@ -4232,9 +4547,9 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" dependencies = [ "cfg-if", "glob", @@ -4243,15 +4558,15 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.32", + "syn 2.0.48", "unicode-ident", ] [[package]] name = "rust-ini" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" dependencies = [ "cfg-if", "ordered-multimap", @@ -4294,22 +4609,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", "ring 0.17.5", @@ -4318,6 +4633,20 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.5", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-pemfile" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4327,16 +4656,22 @@ dependencies = [ ] [[package]] -name = "rustls-webpki" -version = "0.100.2" +name = "rustls-pemfile" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "base64 0.22.0", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4347,6 +4682,17 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring 0.17.5", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] name = "rustversion" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4385,7 +4731,7 @@ dependencies = [ "ci_info", "getopts", "nias", - "toml", + "toml 0.5.10", ] [[package]] @@ -4412,6 +4758,7 @@ dependencies = [ "chrono", "dyn-clone", "indexmap 1.9.2", + "indexmap 2.2.6", "schemars_derive", "serde", "serde_json", @@ -4491,29 +4838,35 @@ dependencies = [ name = "segment" version = "0.6.0" dependencies = [ + "ahash", "atomic_refcell", "atomicwrites", "bincode", + "bitpacking", "bitvec", "cgroups-rs", "charabia", "chrono", "common", "criterion", + "fnv", "fs_extra", - "futures", + "generic-tests", "geo", "geohash", + "indexmap 2.2.6", "io", "io-uring", - "itertools 0.12.0", - "lazy_static", + "is_sorted", + "itertools 0.12.1", "log", - "memmap2 0.9.2", + "macro_rules_attribute", + "memmap2 0.9.4", "memory", + "nom", + "num-cmp", "num-derive", "num-traits", - "num_cpus", "ordered-float 4.2.0", "parking_lot", "pprof", @@ -4533,6 +4886,7 @@ dependencies = [ "serde-value", "serde_cbor", "serde_json", + "smallvec", "smol_str", "sparse", "sysinfo", @@ -4548,15 +4902,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -4583,13 +4940,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -4605,9 +4962,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -4637,6 +4994,15 @@ dependencies = [ ] [[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4649,6 +5015,29 @@ dependencies = [ ] [[package]] +name = "serial_test" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +dependencies = [ + "dashmap", + "lazy_static", + "parking_lot", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "sha1" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4661,9 +5050,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4681,9 +5070,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" @@ -4695,6 +5084,18 @@ dependencies = [ ] [[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] name = "siphasher" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4745,15 +5146,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol_str" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" dependencies = [ "serde", ] @@ -4796,14 +5197,14 @@ version = "0.1.0" dependencies = [ "common", "io", - "itertools 0.12.0", - "memmap2 0.9.2", + "itertools 0.12.1", + "memmap2 0.9.4", "memory", "ordered-float 4.2.0", + "parking_lot", "rand 0.8.5", "schemars", "serde", - "serde_json", "tempfile", "validator", ] @@ -4819,9 +5220,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "stable_deref_trait" @@ -4849,12 +5247,11 @@ dependencies = [ "common", "env_logger", "futures", - "http", + "http 0.2.9", "io", - "itertools 0.12.0", + "itertools 0.12.1", "log", "memory", - "num_cpus", "parking_lot", "proptest", "prost 0.11.9", @@ -4867,6 +5264,7 @@ dependencies = [ "serde", "serde_cbor", "serde_json", + "strum", "tar", "tempfile", "thiserror", @@ -4892,10 +5290,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.48", +] + +[[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 = "symbolic-common" @@ -4933,9 +5359,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -4944,9 +5370,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sys-info" @@ -4960,9 +5386,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.30.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4970,28 +5396,7 @@ dependencies = [ "ntapi", "once_cell", "rayon", - "winapi", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", + "windows 0.52.0", ] [[package]] @@ -5013,15 +5418,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", - "rustix 0.38.21", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] @@ -5045,22 +5449,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -5075,6 +5479,20 @@ dependencies = [ ] [[package]] +name = "thread-priority" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a617e9eeeb20448b01a8e2427fb80dfbc9c49d79a1de3b11f25731edbf547e3c" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", + "log", + "rustversion", + "winapi", +] + +[[package]] name = "thread_local" version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5133,6 +5551,15 @@ dependencies = [ ] [[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5159,9 +5586,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.35.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5195,7 +5622,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -5204,7 +5631,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.11", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", "tokio", ] @@ -5243,6 +5681,40 @@ dependencies = [ ] [[package]] +name = "toml" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] name = "tonic" version = "0.9.2" source = "git+https://github.com/qdrant/tonic?branch=v0.9.2-patched#060ab88c87955adc59d46a44b4e3b72cb4cc1522" @@ -5255,17 +5727,17 @@ dependencies = [ "flate2", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-timeout", "percent-encoding", "pin-project", "prost 0.11.9", - "rustls-pemfile", + "rustls-pemfile 1.0.3", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-stream", "tower", "tower-layer", @@ -5281,9 +5753,9 @@ checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.4", "proc-macro2", - "prost-build 0.12.0", + "prost-build 0.12.3", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -5333,11 +5805,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5346,20 +5817,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.48", ] [[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", @@ -5397,9 +5868,9 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6c7bf057d67aa107e076129a4f331aaac47ec379952d9f0775c6b1d838ee97" +checksum = "6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614" dependencies = [ "tracing-core", "tracing-subscriber", @@ -5408,9 +5879,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546e6c86bca7bd67b86437eade85e98b327de24cdb8429c701a98af755034572" +checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d" dependencies = [ "loom", "once_cell", @@ -5439,6 +5910,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] +name = "typetag" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43148481c7b66502c48f35b8eef38b6ccdc7a9f04bd4cc294226d901ccc9bc7" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291db8a81af4840c10d636e047cac67664e343be44e24dfdbd1492df9a5d3390" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "ucd-trie" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5481,6 +5976,12 @@ 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" @@ -5521,17 +6022,18 @@ dependencies = [ [[package]] name = "ureq" -version = "2.7.1" +version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ "base64 0.21.0", "log", "once_cell", - "rustls", - "rustls-webpki 0.100.2", + "rustls 0.22.4", + "rustls-pki-types", + "rustls-webpki 0.102.2", "url", - "webpki-roots 0.23.1", + "webpki-roots", ] [[package]] @@ -5554,15 +6056,21 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.11", "serde", ] [[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[package]] name = "validator" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5634,7 +6142,7 @@ dependencies = [ [[package]] name = "wal" version = "0.1.2" -source = "git+https://github.com/qdrant/wal.git?rev=fad0e7c48be58d8e7db4cc739acd9b1cf6735de0#fad0e7c48be58d8e7db4cc739acd9b1cf6735de0" +source = "git+https://github.com/qdrant/wal.git?rev=a7870900f29811a24e20882887d60e6a2febf945#a7870900f29811a24e20882887d60e6a2febf945" dependencies = [ "byteorder", "crc32c", @@ -5643,18 +6151,18 @@ dependencies = [ "env_logger", "fs4", "log", - "memmap2 0.9.2", + "memmap2 0.9.4", "rand 0.8.5", "rand_distr", - "rustix 0.38.21", + "rustix 0.37.27", "serde", ] [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5684,9 +6192,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5694,24 +6202,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -5721,9 +6229,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5731,28 +6239,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -5763,9 +6271,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -5773,26 +6281,20 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ - "rustls-webpki 0.100.2", + "rustls-pki-types", ] [[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] name = "whatlang" -version = "0.16.2" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" +checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.14.2", "once_cell", ] @@ -5848,6 +6350,25 @@ dependencies = [ ] [[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5881,6 +6402,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5911,6 +6441,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5923,6 +6468,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5935,6 +6486,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5947,6 +6504,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5959,6 +6522,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5971,6 +6540,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5983,6 +6558,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5995,10 +6576,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +dependencies = [ + "memchr", +] + +[[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -6054,7 +6650,7 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -6064,10 +6660,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" [[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] name = "zerovec" -version = "0.9.6" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46" +checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" dependencies = [ "zerofrom", ] @@ -6103,11 +6705,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.2+zstd.1.5.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 6.0.2+zstd.1.5.2", + "zstd-safe 7.0.0", ] [[package]] @@ -6122,20 +6724,19 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.2+zstd.1.5.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.4+zstd.1.5.2" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 801887103ec4f..8a9ec8e3a4591 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -13,25 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.7.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-BgsLmE50mGmB5fcUjov8wcAHRTKMYaoyoXjSUyIddlc="; + sha256 = "sha256-SirqQW/OxFvsyra80znSDakHwFjHk2YkpAaNwXnbK60="; }; - patches = [ - ./1.7.4-CVE-2024-3078.patch - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "quantization-0.1.0" = "sha256-ggVqJiftu0nvyEM0dzsH0JqIc/Z1XILyUSKiJHeuuZs="; + "quantization-0.1.0" = "sha256-BofK1X06efESoxVJmlCY5D3toFmo2ZkKNz11ot2imIs="; "tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE="; - "wal-0.1.2" = "sha256-nBGwpphtj+WBwL9TmWk7qXiEqlIWkgh/2V9uProqhMk="; + "wal-0.1.2" = "sha256-YjOXYg8dnYsb+Zl6xUkAccjZZn3tyf3fR/kWTfUjlgg="; }; }; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 67bb783205484..19450e532d20f 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.36.0"; + version = "2.36.1"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-UTzWGwvlRtflpvMNbEg9XM2wllfa41EGLri9GcDzP4c="; + sha256 = "sha256-Dj4lyg0z/Wfy+CUWHHJtSNHbitFmLJaLletxyiXdrmU="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 40d832620c3fa..20637c70129f0 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -9,7 +9,6 @@ , shadow , procps , nixosTests -, fetchpatch }: let @@ -27,15 +26,6 @@ buildGoModule { }; vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; - patches = [ - # Reverts "cmd/tailscaled/tailscaled.service: revert recent hardening" - (fetchpatch { - url = "https://github.com/tailscale/tailscale/commit/2889fabaefc50040507ead652d6d2b212f476c2b.patch"; - hash = "sha256-DPBrv7kjSVXhmptUGGzOkaP4iXi/Bym3lvqy4otL9HE="; - revert = true; - }) - ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index dc36f52968137..1b127edba0d60 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2024-03-20"; + version = "0-unstable-2024-04-30"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "707cda345078553f3e878a100ca103a28f440705"; - hash = "sha256-pgihFkuPIjFTLYtVKaXA+NPUfs/8TpWoojpGyi5TLhY="; + rev = "4eab7ea772f0a288c99a79947dd332efc1884315"; + hash = "sha256-rXEtn0mO0hEH1zuDJ9vzsAeZfHnw9mkitzMqr7o5UYs="; }; installPhase = '' diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 9e10746b53636..cb76180fa7ab8 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -59,14 +59,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.15.38"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.15.43"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-ddZqexGrO2m8iUE9RDkks0ohm27dpitbsj+20aWUrJw="; + hash = "sha256-L+1+4QXDya8wwjexPB0fwx6/nRDPDrMYaaYeRm2SEU8="; }; postPatch = '' @@ -78,7 +78,7 @@ with py.pkgs; buildPythonApplication rec { --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' substituteInPlace requirements-base.txt \ - --replace-fail "wheel==0.38.4" "wheel>=0.38.4" + --replace-fail "wheel==0.43.0" "wheel>=0.43.0" # Upstream needs pip to build and install dependencies and validates this # with a configure script, but we don't as we provide all of the packages diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index e6d401ebc2378..dacf5155b321e 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2024-04-05"; + version = "0-unstable-2024-04-23"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "c3d7782a0cbb0aee91edae9b2850d053f27a6f0e"; - hash = "sha256-2Iluv/cRouAvKyH5W8llAJm+SrofFkE2N5WnnFf++EU="; + rev = "c0951f2a3182d8b70ffe579bfd9da24c2b86e232"; + hash = "sha256-7y2Mte6R4yeayxdFSFGb9Q5M/GQwqyFb+AW/BFsQeZc="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 8c991c03a1cbe..bfb27003c4239 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.91.3"; + version = "0.92.2"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Kdk3T699cfyIDAt1vo8nQAmkR7TanNmjjI9v80PMTuE="; + hash = "sha256-V5CUDBQL5ZqurNSowfh+916BScqg0o5O37pl1o8W96g="; }; - vendorHash = "sha256-8u+V/D8Pr+VIy+6QbJYRQcfcpAbHEHN6TBitoYxgKHw="; + vendorHash = "sha256-6gjYnDv4L2AO47uWcp/MySX9i3IDMIWQUvgglxPCvGo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 8c22e6941c4d6..167356580508b 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.50.4"; + version = "0.51.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-KFVeJmtMPGPjeiXzeVFtY73drZ4CySdmMRxDqEJfA4c="; + hash = "sha256-JrUZkKiiSJ0GItOj7x+CbrO2WpOSsDFz32mkwsQjs28="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-aki+kwjZxPPD/K3k8wJMc2HNB6DzFf92mcOOQFwsbXU="; + vendorHash = "sha256-mIbqI9uBjLuIQKdju+5VtM4gPGxPCC9vMilmiySjdpI="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index e841b1291013d..689cea017ab35 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,7 +19,7 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "unstable-2024-01-31"; + version = "0-unstable-2024-01-31"; src = fetchFromGitHub { owner = "kaldi-asr"; diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index 2b1865a6f91c6..9e094cea975d3 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2023-08-27"; + version = "0.1-unstable-2023-08-27"; src = fetchFromGitHub { owner = "vgmrips"; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index cd8bf05ab6dfc..6e2bdaea8f9e2 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.8"; + version = "6.8.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-nCFkX+rBgmEeKLR3adX2E8ueLsq1js5gsQ5sVanq1XU="; + hash = "sha256-DkCgaKJsKWnLAqlbqf74iNemNW4/RX/5KtJHfQhzVng="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/tools/games/minecraft/fabric-installer/default.nix index 4a11a08a42e6e..bbec1d40d09cb 100644 --- a/pkgs/tools/games/minecraft/fabric-installer/default.nix +++ b/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fabric-installer"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; - sha256 = "sha256-fX5bHTp/jiCBBpiY6V3HHYS7Olx5yyNcA0iVFzz9NHs="; + sha256 = "sha256-Yu3xcL3MQe3qhdM6zz64VHQlhpmz1B+UGNKGyDbLCI0="; }; dontUnpack = true; diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/tools/games/steam-rom-manager/default.nix index 89af86fe7511d..e146301a2b2c8 100644 --- a/pkgs/tools/games/steam-rom-manager/default.nix +++ b/pkgs/tools/games/steam-rom-manager/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { name = "steam-rom-manager"; - version = "2.4.17"; + version = "2.4.24"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-NRqryY9v6s51/eoCdqqID6m5Osx5PPChKGxjmLhh7ac="; + sha256 = "sha256-mNH6ySA2bW5gEHGSJgJ8e2XkQrObQeiAWQlAp7aV688="; }; extraInstallCommands = let diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index e7cc5a6cfae5c..6275b39e44605 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.6.0"; + version = "11.6.1"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4897"; - sha256 = "2aTDM0aVfav2mnOLXj0HuTdbsY7EUH8ieBrXgaFU7FU="; + rev = "4907"; + sha256 = "eMLADYFf/Us8eiBTacf+wvQSGyrV+fslpvlTT+rIiYM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index b34b1ee4d5170..f61defdbdedae 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2022-04-18"; + version = "0-unstable-2022-04-18"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index f6bcff31a00f0..24c4266424a72 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "edid-decode"; - version = "unstable-2024-04-02"; + version = "0-unstable-2024-04-02"; outputs = [ "out" diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 6d72dc40ca0da..d8428e365fcd1 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20240319.0"; + version = "20240412.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jiEXZWw8A4RcsRbypFpWkt8O3Ib1cNcOQO1zHt96aQU="; + hash = "sha256-MT/EpZ8kDKHhJGF4njdh6Q+xe8GF4FYxaoIighSguiQ="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 972ac63e83dce..063dfca667fc7 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.3.2"; + version = "2024.4.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WeTajznndw01jXIEnOiSEy9psLuMeAC6j7UmHg0+Fys="; + hash = "sha256-q4SVsfd5PJjeqt6UJJG6vuyxTA/bqDDl6e5dxhWIfYM="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/tools/misc/hunt/default.nix index 2c135e0285138..6163e8cf3b0da 100644 --- a/pkgs/tools/misc/hunt/default.nix +++ b/pkgs/tools/misc/hunt/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Simplified Find command made with Rust"; - homepage = "https://github.com/LyonSyonII/hunt"; + homepage = "https://github.com/LyonSyonII/hunt-rs"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; mainProgram = "hunt"; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 293c32b3e6ff2..ebcd89bd6bd79 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2024-02-08"; + version = "1.21.1-unstable-2024-02-08"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -101,7 +101,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Network boot firmware"; diff --git a/pkgs/tools/misc/minipro/default.nix b/pkgs/tools/misc/minipro/default.nix index 870c4706f8820..13bb93cb4fbe5 100644 --- a/pkgs/tools/misc/minipro/default.nix +++ b/pkgs/tools/misc/minipro/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "minipro"; - version = "0.6"; + version = "0.7"; src = fetchFromGitLab { owner = "DavidGriffith"; repo = "minipro"; rev = version; - sha256 = "sha256-6i4PYzSm6lcO/Nb6n3holrNe4TtAnG2o81ZIMAIGqOE="; + hash = "sha256-suMGR1vgM2tXsPHInZ6HEDKhDSPlC1ss+wCgbION/rE="; }; nativeBuildInputs = [ pkg-config ]; @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.bmwalters ]; mainProgram = "minipro"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 6a0fafc7815cd..0791a0d3ae6b9 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.98.0"; + version = "0.99.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-YdaAP/o8WhiGOggF2Xo66TzE7PCJDkvbiCFPLVG4SHQ="; + sha256 = "sha256-C4uD9n8BTWi0/Vct06mD7zk5WQ0XmSLoYVpzflb2JQU="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-4hQcHUX/UgeG/ojljq4eJCqZIYp1unNsngprr/3C9q0="; + vendorHash = "sha256-kHbO5K3aYTdjHi8SKN05QNGPaXEwIG2mKdu4AV6WDeo="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 7dff66bc10034..ec1603640a8ef 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240322"; + version = "20240422"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - hash = "sha256-CxcCmiA9q/e6bKflLC05EP/0ayl5R24SqREJILeeapU="; + hash = "sha256-eDiIID7eK5LO0x6z6AnKOp2J9FCP3LEYML+zV1SIJGc="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 9ce23873aa270..f0acc5cc04b0e 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "riemann-c-client"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitea { domain = "git.madhouse-project.org"; owner = "algernon"; repo = "riemann-c-client"; rev = "riemann-c-client-${version}"; - hash = "sha256-FIhTT57g2uZBaH3EPNxNUNJn9n+0ZOhI6WMyF+xIr/Q="; + hash = "sha256-GAinZtEetRAl04CjxNCTCkGbvdhSZei7gon3KxEqiIY="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index f4ae05711285f..bcf77c2db2cf7 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "tewisay"; - version = "unstable-2022-11-04"; + version = "0-unstable-2022-11-04"; # lucy deleted the old repo, this is a fork/mirror src = fetchFromGitHub { diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 07ad336458495..4ef5279ef4763 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "sha256-MMkNLhQP3ztWoRYhCU/cNXE/M+/ny41OK1SA9oM/lZg="; + sha256 = "sha256-7izs2C5/czec0Dt3apL8s7luARAlw4PfUFy9Xsxb0zw="; }; depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index 0b75657fb121d..ad0c271fda667 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "unstable-2024-03-05"; + version = "0-unstable-2024-03-05"; src = fetchFromGitHub { owner = "paoloose"; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 0841a6490cc4b..32ee78ff6cb05 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-wJt8247RKS6g+O2Ho75Fn4O4w6RoxotRm0yXBRM9d8g="; + hash = "sha256-S0c/UqdbEqhZRkxZonW1TPQLmGbZeiK14yPbW5dpI70="; }; - cargoHash = "sha256-JLDNAuYE7Pu9E82TD2cz9lnCWEC9bNQxd3MP4lXjo3k="; + cargoHash = "sha256-IuubIEu2mY3h1i9gJgQlyVoGwUYWsdp8+hKYyz0j3is="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 2207fa5baae42..fe5aaed413be5 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.3.3"; + version = "6.5.0"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-LsJAuEVJy4jTvFEOgbH6ZiiqbMoGXuMNDhHx4phwd5k="; + hash = "sha256-owGVErklezVdXk15qkT70E2uoF9TyoQMEA3Hbvzqm6I="; }; vendorHash = "sha256-ckgX+gftWJROe/RpxjuBmXSDxW/PlCOIkrx+erxCP40="; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 3a15790172c30..3472534cbe816 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.12.4"; + version = "1.12.5"; outputs = [ "out" "mu4e" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-X5rOBDeT0yfnwTKBWQ4F6DTrFZ/dq3BgQBCn9RAQPf4="; + hash = "sha256-dQeXL+CcysmlV6VYSuZtWGSgIhoqP6Y20Qora4l0iP8="; }; postPatch = '' diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 17c0d1390f31a..6ab3809c47965 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - hash = "sha256-7Yf22EpOTEGGqPoNGnHFyn5A4n7aYFXoSE1G6zyzT3M="; + hash = "sha256-K4sTvt0rIDh8A7uhUQmw3zvS2ksclOLBO76wHevRONU="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index b95d0537a8dc2..0531a3d20b248 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.14.44"; + version = "3.14.71"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,12 +9,15 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-LlTyhtx3DbtsQdkl6J7ktj/zLJULFqQWq5sCqKPX71g="; + hash = "sha256-33aDL+nJ+BOwOOSfiaAX3r8BdDM2rWCaeiz55nUXrd8="; meta = with lib; { description = "Unified hosts file with base extensions"; homepage = "https://github.com/StevenBlack/hosts"; license = licenses.mit; - maintainers = with maintainers; [ moni ]; + maintainers = with maintainers; [ + moni + Guanran928 + ]; }; } diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock index 5baab49d437fb..c783ac9a5907b 100644 --- a/pkgs/tools/networking/veilid/Cargo.lock +++ b/pkgs/tools/networking/veilid/Cargo.lock @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -206,9 +206,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arboard" @@ -223,7 +223,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "thiserror", "windows-sys 0.48.0", "x11rb", @@ -288,27 +288,26 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.1", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -319,7 +318,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-executor", "async-io 2.3.2", "async-lock 3.3.0", @@ -360,8 +359,8 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -400,26 +399,26 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.32", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ "async-io 2.3.2", - "async-lock 2.8.0", + "async-lock 3.3.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -452,9 +451,9 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0ed2b6671c13d2c28756c5a64e04759c1e0b5d3d7ac031f521c3561e21fbcb" +checksum = "bc3b454643291f9a4a3bbdb35fa62efa4ba7be5ea13fe243e3be4352182ff4b8" dependencies = [ "async-std", "async-trait", @@ -484,24 +483,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -732,7 +731,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -777,18 +776,16 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] @@ -802,9 +799,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" @@ -844,9 +841,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cesu8" @@ -907,16 +904,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -997,7 +994,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1008,9 +1005,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code", ] @@ -1051,9 +1048,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -1061,9 +1058,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -1127,7 +1124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ "futures-core", - "prost 0.12.3", + "prost 0.12.4", "prost-types", "tonic 0.10.2", "tracing-core", @@ -1311,7 +1308,7 @@ dependencies = [ "futures-core", "libc", "mio", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "signal-hook", "signal-hook-mio", "winapi", @@ -1355,12 +1352,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1430,7 +1427,7 @@ dependencies = [ "log", "num", "owning_ref", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "serde_json", "serde_yaml", "time", @@ -1474,7 +1471,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1530,7 +1527,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1552,7 +1549,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1562,17 +1559,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "der" @@ -1694,9 +1691,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "embedded-io" @@ -1719,7 +1716,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1739,7 +1736,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1782,7 +1779,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1860,13 +1857,15 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", + "portable-atomic", + "portable-atomic-util", ] [[package]] @@ -1881,11 +1880,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -1922,9 +1921,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1947,9 +1946,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "filetime" @@ -1965,9 +1964,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7" dependencies = [ "crc32fast", "miniz_oxide", @@ -2033,7 +2032,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2057,7 +2056,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -2130,7 +2129,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -2145,7 +2144,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2234,9 +2233,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2306,7 +2305,7 @@ dependencies = [ "grpcio-sys", "libc", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "protobuf", ] @@ -2380,9 +2379,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -2394,7 +2393,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2457,9 +2456,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -2481,9 +2480,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -2491,7 +2490,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand", "resolv-conf", "smallvec", @@ -2729,7 +2728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2790,15 +2789,6 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" @@ -2908,7 +2898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62802173041ed97845bc20f8cf6817e445fe537ed879ddf43fb96166829ec8ff" dependencies = [ "keyvaluedb", - "parking_lot 0.12.1", + "parking_lot 0.12.2", ] [[package]] @@ -2920,7 +2910,7 @@ dependencies = [ "hex", "keyvaluedb", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rusqlite", ] @@ -2937,7 +2927,7 @@ dependencies = [ "keyvaluedb", "keyvaluedb-memorydb", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "send_wrapper 0.6.0", "wasm-bindgen", "web-sys", @@ -2972,9 +2962,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libc-print" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17f111e2175c779daaf5e89fe3a3b0776b0adec218bc1159c56e4d3f58032f5" +checksum = "a4a660208db49e35faf57b37484350f1a61072f2a5becf0592af6015d9ddd4b0" dependencies = [ "libc", ] @@ -2986,7 +2976,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3042,9 +3032,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3221,7 +3211,7 @@ dependencies = [ "ndk-macro", "ndk-sys 0.4.1+23.1.7779620", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", ] [[package]] @@ -3239,18 +3229,18 @@ dependencies = [ [[package]] name = "ndk-sys" -version = "0.3.0" +version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" dependencies = [ "jni-sys", ] [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" dependencies = [ "jni-sys", ] @@ -3399,9 +3389,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -3732,12 +3722,12 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "paranoid-android" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e736c9fbaf42b43459cd1fded3dd272968daadfcbc5660ee231a12899f092289" +checksum = "101795d63d371b43e38d6e7254677657be82f17022f7f7893c268f33ac0caadc" dependencies = [ "lazy_static", - "ndk-sys 0.3.0", + "ndk-sys 0.5.0+25.2.9519653", "sharded-slab", "smallvec", "tracing-core", @@ -3763,12 +3753,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -3787,15 +3777,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -3864,7 +3854,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3905,7 +3895,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3927,7 +3917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", ] @@ -3984,15 +3974,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.3.9", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -4009,6 +3999,21 @@ dependencies = [ ] [[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "portable-atomic-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a7411625b38d51b41421c6333976adffd4674a925a978856734a2dc853449b" +dependencies = [ + "portable-atomic", +] + +[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4041,9 +4046,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -4060,12 +4065,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", - "prost-derive 0.12.3", + "prost-derive 0.12.4", ] [[package]] @@ -4083,24 +4088,24 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ - "prost 0.12.3", + "prost 0.12.4", ] [[package]] @@ -4117,9 +4122,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -4211,6 +4216,15 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] name = "redox_users" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4424,9 +4438,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -4437,9 +4451,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -4468,9 +4482,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rustyline-async" @@ -4505,9 +4519,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309" dependencies = [ "dyn-clone", "schemars_derive", @@ -4517,14 +4531,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108" dependencies = [ "proc-macro2", "quote", - "serde_derive_internals 0.26.0", - "syn 1.0.109", + "serde_derive_internals 0.29.0", + "syn 2.0.60", ] [[package]] @@ -4615,9 +4629,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] @@ -4674,42 +4688,42 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] name = "serde_derive_internals" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -4718,13 +4732,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4759,7 +4773,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "serial_test_derive", ] @@ -4771,7 +4785,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4865,9 +4879,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -5023,9 +5037,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -5040,9 +5054,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.30.8" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b1a378e48fb3ce3a5cf04359c456c9c98ff689bcf1c1bc6e6a31f247686f275" +checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -5068,7 +5082,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.32", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -5083,32 +5097,32 @@ dependencies = [ [[package]] name = "thingbuf" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4706f1bfb859af03f099ada2de3cea3e515843c2d3e93b7893f16d94a37f9415" +checksum = "662b54ef6f7b4e71f683dadc787bbb2d8e8ef2f91b682ebed3164a5a7abca905" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project", ] [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5134,9 +5148,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -5157,9 +5171,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -5200,7 +5214,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project-lite", "signal-hook-registry", "socket2 0.5.6", @@ -5227,7 +5241,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5274,7 +5288,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.12", ] [[package]] @@ -5299,15 +5313,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.7", ] [[package]] @@ -5356,7 +5370,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.3", + "prost 0.12.4", "tokio", "tokio-stream", "tower", @@ -5429,7 +5443,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5585,7 +5599,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5648,9 +5662,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode_categories" @@ -5771,7 +5785,7 @@ dependencies = [ [[package]] name = "veilid-cli" -version = "0.3.1" +version = "0.3.2" dependencies = [ "arboard", "async-std", @@ -5796,7 +5810,7 @@ dependencies = [ "log", "lru", "owning_ref", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rustyline-async", "serde", "serde_derive", @@ -5812,7 +5826,7 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.3.1" +version = "0.3.2" dependencies = [ "argon2", "async-io 1.13.0", @@ -5861,7 +5875,7 @@ dependencies = [ "num-traits", "once_cell", "paranoid-android", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "paste", "range-set-blaze", "rustls", @@ -5915,7 +5929,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.3.1" +version = "0.3.2" dependencies = [ "allo-isolate", "android_log-sys 0.3.1", @@ -5935,7 +5949,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "oslog", "paranoid-android", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "serde", "serde_json", "tokio", @@ -5953,7 +5967,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a3dabbda02cfe176635dcaa18a021416ff2eb4d0b47a913e3fdc7f62049d7b1" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -5972,7 +5986,7 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.3.1" +version = "0.3.2" dependencies = [ "ansi_term", "async-std", @@ -5994,7 +6008,7 @@ dependencies = [ "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rpassword", "serde", "serde_derive", @@ -6022,7 +6036,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.3.1" +version = "0.3.2" dependencies = [ "android_logger 0.13.3", "async-lock 2.8.0", @@ -6052,7 +6066,7 @@ dependencies = [ "once_cell", "oslog", "paranoid-android", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand", "rand_core", "range-set-blaze", @@ -6080,7 +6094,7 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.3.1" +version = "0.3.2" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", @@ -6089,7 +6103,7 @@ dependencies = [ "gloo-utils 0.2.0", "js-sys", "lazy_static", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "send_wrapper 0.6.0", "serde", "serde-wasm-bindgen 0.6.5", @@ -6166,7 +6180,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -6200,7 +6214,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6233,7 +6247,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -6308,12 +6322,14 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wg" -version = "0.3.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f390449c16e0679435fc97a6b49d24e67f09dd05fea1de54db1b60902896d273" +checksum = "dadf90865f15d5c2d87f126a56ce3715b3a233641acdd10f59200aa7f4c81fb9" dependencies = [ - "atomic-waker", - "parking_lot 0.12.1", + "event-listener 5.3.0", + "futures-core", + "parking_lot 0.12.2", + "pin-project-lite", "triomphe", ] @@ -6326,14 +6342,14 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.32", + "rustix 0.38.34", ] [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -6353,11 +6369,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -6383,7 +6399,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6401,7 +6417,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6416,13 +6432,13 @@ dependencies = [ [[package]] name = "windows-service" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" +checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "widestring", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -6449,7 +6465,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -6484,17 +6500,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -6511,9 +6528,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -6529,9 +6546,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -6547,9 +6564,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -6565,9 +6588,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -6583,9 +6606,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -6601,9 +6624,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -6619,9 +6642,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -6634,9 +6657,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] @@ -6677,7 +6700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "gethostname", - "rustix 0.38.32", + "rustix 0.38.34", "x11rb-protocol", ] @@ -6781,7 +6804,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -6801,7 +6824,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index e88671b370689..d41177eabf306 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pBMUwCZ1dLLde+RF9smy4/RZYmtyW+oTeo3LHNtscSc="; + sha256 = "sha256-iaWdI6lhxX3xdpd5caPl5cWXrBkWiMc7T/dMXp2hqNM="; }; cargoLock = { diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 104b5d11217ad..78d402502e1a5 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.18.6"; + version = "0.18.7"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-j/Ns5H030MyYd2LV2WE0bUdd50u6ihgy/QBttu3TwQ4="; + sha256 = "sha256-hSUShO2R0MwRMaCOl3UYI4laJj513lwExhUyYJlQDMk="; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre2 libgcrypt ]; diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index f2d2aee7146bc..7bf7c36424886 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "bash-supergenpass"; - version = "unstable-2024-03-24"; + version = "0-unstable-2024-03-24"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 0ee20dbc4f6b6..d17b1146466dc 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.26.3"; + version = "2.27.0"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-jX8U+DcuoYGfxQgYOIn03Vg/OesMVLHZ1gbGBSlgIbI="; + sha256 = "sha256-zpb5c3qGfBoRX9V1lVRX8607hBEHgjR8ZWJizfYNgUM="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index 06cbecad8474a..eb3c3cd229e5b 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-5jK+f6IFPhGit+jxkSLTcWN1+nJRQaCZKpWZYId+2bk="; + hash = "sha256-CCQDMIBpKmaUSRwyjryTO3YWVIrr6FwW64K+alTrcdw="; }; - vendorHash = "sha256-tUvFT+rE58yxNJGhqqwSG0GlGushkUpngxLkmyjjFFY="; + vendorHash = "sha256-K38hxWcrYOznXr8eST0xQBL0nNxHMAiGji5rFwAK0Qw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index 67b882ee103f2..b269cd362f2b0 100644 --- a/pkgs/tools/security/cve-bin-tool/default.nix +++ b/pkgs/tools/security/cve-bin-tool/default.nix @@ -1,35 +1,31 @@ { lib , buildPythonApplication , fetchFromGitHub + # aiohttp[speedups] +, aiodns +, aiohttp +, beautifulsoup4 +, brotlipy +, cvss +, distro , filetype +, google-cloud-sdk +, jinja2 , jsonschema , lib4sbom , packageurl-python -, python-gnupg +, packaging , plotly -, beautifulsoup4 +, pytestCheckHook +, python-gnupg , pyyaml -, isort -, py -, jinja2 -, rpmfile -, reportlab -, zstandard , rich -, aiohttp +, rpmfile +, setuptools , toml -, distro - # aiohttp[speedups] -, aiodns -, brotlipy -, faust-cchardet -, pillow -, pytestCheckHook , xmlschema -, setuptools -, packaging -, cvss -, google-cloud-sdk +, zstandard +, reportlab , pip , testers , cve-bin-tool @@ -50,45 +46,45 @@ buildPythonApplication rec { # Wants to open a sqlite database, access the internet, etc doCheck = false; - propagatedNativeBuildInputs = [ - pip - ]; - - propagatedBuildInputs = [ - google-cloud-sdk + dependencies = [ + # aiohttp[speedups] + aiodns + aiohttp + beautifulsoup4 + brotlipy + cvss + distro filetype + google-cloud-sdk # gsutil + jinja2 jsonschema lib4sbom packageurl-python - python-gnupg + packaging plotly - beautifulsoup4 + python-gnupg pyyaml - isort - py - jinja2 - rpmfile - reportlab - zstandard rich - aiohttp - toml - distro - # aiohttp[speedups] - aiodns - brotlipy - faust-cchardet - # needed by brotlipy - pillow + rpmfile setuptools + toml xmlschema - cvss - packaging + zstandard + ]; + + optional-dependencies = { + pdf = [ + reportlab + ]; + }; + + propagatedBuildInputs = [ + pip ]; nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "cve_bin_tool" diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 9bf6995715924..2c1e1ad5b7d2a 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -29,7 +29,7 @@ assert lib.assertOneOf "backend" backend [ "x11" "wayland" ]; stdenv.mkDerivation { pname = "rofi-pass"; - version = "unstable-2024-02-13"; + version = "2.0.2-unstable-2024-02-13"; src = fetchFromGitHub { owner = "carnager"; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 648a4bc6515b8..e4c428b90b9aa 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, botan2, libobjc, Security }: +{ lib, stdenv, fetchurl, botan2, sqlite, libobjc, Security }: stdenv.mkDerivation rec { @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-crypto-backend=botan" "--with-botan=${lib.getDev botan2}" + "--with-objectstore-backend-db" "--sysconfdir=$out/etc" "--localstatedir=$out/var" - ]; + ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ libobjc Security ]; - buildInputs = [ botan2 ]; + buildInputs = [ botan2 sqlite ]; postInstall = "rm -rf $out/var"; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 4f748ca1b4251..5f24a8a6f6b2c 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-dafK7PkjWmLbV9fcaR+Vl1CQrpGdo8IQpaSbUwY26Uw="; + hash = "sha256-OFYUM6NFNwpx356y+G1yAOOgpinK8qOkLBtUMFPFXK8="; }; - vendorHash = "sha256-hWIIGQb2tZjhQ+XxaUacBgRSFFQIWj728pjKZFi0Wto="; + vendorHash = "sha256-pWteRqBGKHcqjN3wSxWuoy0YK7w2Zaz2BsiveG7UkVE="; proxyVendor = true; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index c80f35a16cbbb..c1dd64d604b42 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.16.1"; + version = "1.16.2"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-s520fOri0caLMeMmNaGS3+Y9I9dcXtNtiRtwrvj1pvA="; - aarch64-linux = "sha256-12yFC3uPyqv2kQIv2KC+skXMrdU+IZir5z62JRtKBMs="; - i686-linux = "sha256-LGkRnI5rZ8j6Fm1FBKiTUJNK8dUF9154OlNEHIsT36Q="; - x86_64-darwin = "sha256-V7uLlQhsRQ36jtbIsdPfU3LvM41xDO3pj97KOlZWSYg="; - aarch64-darwin = "sha256-QGxg11DR1LbRzRE2CqyGSWvus1IXIECbtamONrqcBVc="; + x86_64-linux = "sha256-fVDHXVI4f/1d6NTgHcURDXAjCkSEwKD3+bhRyvIgfjw="; + aarch64-linux = "sha256-tfRqnroz9W7V3gCataJbm2t97OJUkVe2VyWXPqbeJaw="; + i686-linux = "sha256-l2aYuyxYAOnAOBwtkEkrpqRNWYL7qsaYJ3vMiknhFow="; + x86_64-darwin = "sha256-xX/syRtkJJjmSO36Apq+i/s4kOMMop3De276358hb0c="; + aarch64-darwin = "sha256-I1FpMRsssil0LQe5LBjpX5b7uTATRJOBzbJeLnKCd74="; }; in fetchzip { diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/tools/text/rust-petname/default.nix index fda0ebf904042..67ce03e822b93 100644 --- a/pkgs/tools/text/rust-petname/default.nix +++ b/pkgs/tools/text/rust-petname/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-petname"; - version = "1.1.3"; + version = "2.0.1"; src = fetchCrate { inherit version; crateName = "petname"; - sha256 = "sha256-C6EJ8awdTV9TecMeYdbmleK8171+hvphjXJrWNJSXxo="; + sha256 = "sha256-n/oqQCshxcqQPYNI0GZXGdZmx0Y12l6QKQpsbThdNAA="; }; - cargoSha256 = "sha256-mB4n1IxhNXrAsCz/jv5jgqyO9OgISZnI5E/vFu80+FE="; + cargoHash = "sha256-Rzhp+lS0ykJsMdd2Z+oTWjFFWGp+ZX0Cup7Hq2bIbrg="; meta = with lib; { description = "Generate human readable random names"; diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index b4bdbb0aff035..db98232c01bc8 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "untrunc-anthwlock"; - version = "unstable-2021-11-21"; + version = "0-unstable-2021-11-21"; src = fetchFromGitHub { owner = "anthwlock"; @@ -30,7 +30,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + # Only stale "latest" tag + hardcodeZeroVersion = true; + }; meta = with lib; { description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 50ffefd1a6f9b..62f4e3e62b255 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = version; - sha256 = "sha256-OEsRSmtNDt3MO5MO7Ch9mOHHHraN+9qfcFn2AhXfvpk="; + sha256 = "sha256-uJsamTsfxpFoKOSgNs6+VQpB7/ec4NoHJsjtDa5Dex8="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index f87596a0b3ff3..6869bfad7641f 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -8,7 +8,7 @@ ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2024-04-08"; + version = "0-unstable-2024-04-08"; src = fetchFromGitHub { owner = "talex5"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc8782eed3083..12bdbeaac3055 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2986,8 +2986,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - darklua = callPackage ../development/tools/darklua { }; - darktile = callPackage ../applications/terminal-emulators/darktile { }; dterm = callPackage ../applications/terminal-emulators/dterm { }; @@ -4142,8 +4140,6 @@ with pkgs; aptdec = callPackage ../development/libraries/aptdec { }; - argc = callPackage ../development/tools/argc { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7455,8 +7451,6 @@ with pkgs; dorkscout = callPackage ../tools/security/dorkscout { }; - downonspot = callPackage ../applications/misc/downonspot { }; - sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; drive = callPackage ../applications/networking/drive { }; @@ -18095,17 +18089,19 @@ with pkgs; electron-source = callPackage ../development/tools/electron { }; inherit (callPackages ../development/tools/electron/binary { }) - electron-bin electron_24-bin electron_27-bin electron_28-bin - electron_29-bin; + electron_29-bin + electron_30-bin; electron_24 = electron_24-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; + electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron = electron_29; + electron-bin = electron_29-bin; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -26584,9 +26580,7 @@ with pkgs; }; radicale2 = callPackage ../servers/radicale/2.x.nix { }; - radicale3 = callPackage ../servers/radicale/3.x.nix { }; - - radicale = radicale3; + radicale3 = radicale; qcal = callPackage ../tools/networking/qcal/default.nix { }; @@ -28351,8 +28345,6 @@ with pkgs; ananicy-cpp = callPackage ../misc/ananicy-cpp { }; - ananicy-rules-cachyos = callPackage ../misc/ananicy-rules-cachyos { }; - andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -35313,7 +35305,7 @@ with pkgs; # so expect breakage. use wrapNeovim instead if you want a stable alternative wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); - neovim-unwrapped = callPackage ../applications/editors/neovim { + neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix { CoreServices = darwin.apple_sdk.frameworks.CoreServices; lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; }; @@ -35332,8 +35324,6 @@ with pkgs; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovide = callPackage ../applications/editors/neovim/neovide { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; viw = callPackage ../applications/editors/viw { }; @@ -40889,10 +40879,8 @@ with pkgs; name = "bsd-setup-hook"; } ../os-specific/bsd/setup-hook.sh; - freebsd = callPackage ../os-specific/bsd/freebsd { }; - freebsdCross = callPackage ../os-specific/bsd/freebsd { - stdenv = crossLibcStdenv; - }; + inherit (callPackage ../os-specific/bsd/freebsd { }) + freebsd freebsdCross; netbsd = callPackage ../os-specific/bsd/netbsd { }; netbsdCross = callPackage ../os-specific/bsd/netbsd { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 674f2c345e5ae..134206df9163d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -249,6 +249,8 @@ self: super: with self; { aiohttp-fast-url-dispatcher = callPackage ../development/python-modules/aiohttp-fast-url-dispatcher { }; + aiohttp-isal = callPackage ../development/python-modules/aiohttp-isal { }; + aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { }; @@ -259,6 +261,8 @@ self: super: with self; { aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { }; + aiohttp-session = callPackage ../development/python-modules/aiohttp-session { }; + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; @@ -307,6 +311,8 @@ self: super: with self; { aiolyric = callPackage ../development/python-modules/aiolyric { }; + aiomcache = callPackage ../development/python-modules/aiomcache { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { }; @@ -5895,6 +5901,8 @@ self: super: with self; { irctokens = callPackage ../development/python-modules/irctokens { }; + isal = callPackage ../development/python-modules/isal { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; islpy = callPackage ../development/python-modules/islpy { }; @@ -6562,6 +6570,8 @@ self: super: with self; { pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; + lib4sbom = callPackage ../development/python-modules/lib4sbom { }; + libais = callPackage ../development/python-modules/libais { }; libarchive-c = callPackage ../development/python-modules/libarchive-c { diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index cd48453fa0eea..a80b40d360605 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -76,6 +76,7 @@ let buildHaskellPackages = true; buildPackages = true; + buildFreebsd = true; generateOptparseApplicativeCompletions = true; callPackage = true; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 9ac0fe2200f92..c477d797795ae 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -148,17 +148,23 @@ in makeScopeWithSplicing' = lib.makeScopeWithSplicing' { inherit splicePackages; inherit (pkgs) newScope; }; # generate 'otherSplices' for 'makeScopeWithSplicing' - generateSplicesForMkScope = attr: + generateSplicesForMkScope = attrs: let - split = X: lib.splitString "." "${X}.${attr}"; + split = X: [ X ] ++ ( + if builtins.isList attrs + then attrs + else if builtins.isString attrs + then lib.splitString "." attrs + else throw "generateSplicesForMkScope must be passed a list of string or string" + ); + bad = throw "attribute should be found"; in { - # nulls should never be reached - selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") null pkgs; - selfBuildHost = lib.attrByPath (split "pkgsBuildHost") null pkgs; - selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") null pkgs; - selfHostHost = lib.attrByPath (split "pkgsHostHost") null pkgs; - selfHostTarget = lib.attrByPath (split "pkgsHostTarget") null pkgs; + selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") bad pkgs; + selfBuildHost = lib.attrByPath (split "pkgsBuildHost") bad pkgs; + selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") bad pkgs; + selfHostHost = lib.attrByPath (split "pkgsHostHost") bad pkgs; + selfHostTarget = lib.attrByPath (split "pkgsHostTarget") bad pkgs; selfTargetTarget = lib.attrByPath (split "pkgsTargetTarget") { } pkgs; }; |