diff options
115 files changed, 2771 insertions, 5931 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 47ac9ca135e5b..98d1a48504730 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19412,6 +19412,12 @@ github = "sweenu"; githubId = 7051978; }; + swendel = { + name = "Sebastian Wendel"; + email = "nixpkgs.aiX5ph@srx.digital"; + github = "SebastianWendel"; + githubId = 919570; + }; swesterfeld = { email = "stefan@space.twc.de"; github = "swesterfeld"; diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 58ceb99b9d7b5..a5e59c4ab42f0 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -131,12 +131,16 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [transfer-sh](https://github.com/dutchcoders/transfer.sh), a tool that supports easy and fast file sharing from the command-line. Available as [services.transfer-sh](#opt-services.transfer-sh.enable). +- [FCast Receiver](https://fcast.org), an open-source alternative to Chromecast and AirPlay. Available as [programs.fcast-receiver](#opt-programs.fcast-receiver.enable). + - [MollySocket](https://github.com/mollyim/mollysocket) which allows getting Signal notifications via UnifiedPush. - [Suwayomi Server](https://github.com/Suwayomi/Suwayomi-Server), a free and open source manga reader server that runs extensions built for [Tachiyomi](https://tachiyomi.org). Available as [services.suwayomi-server](#opt-services.suwayomi-server.enable). - [ping_exporter](https://github.com/czerwonk/ping_exporter), a Prometheus exporter for ICMP echo requests. Available as [services.prometheus.exporters.ping](#opt-services.prometheus.exporters.ping.enable). +- [Prometheus DNSSEC Exporter](https://github.com/chrj/prometheus-dnssec-exporter), check for validity and expiration in DNSSEC signatures and expose metrics for Prometheus. Available as [services.prometheus.exporters.dnssec](#opt-services.prometheus.exporters.dnssec.enable). + - [TigerBeetle](https://tigerbeetle.com/), a distributed financial accounting database designed for mission critical safety and performance. Available as [services.tigerbeetle](#opt-services.tigerbeetle.enable). - [go-camo](https://github.com/cactus/go-camo), a secure image proxy server. Available as [services.go-camo](#opt-services.go-camo.enable). @@ -283,6 +287,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and [v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes. +- `gonic` has been updated to v0.16.4. Config now requires `playlists-path` to be set. See the rest of the [v0.16.0 release notes](https://github.com/sentriz/gonic/releases/tag/v0.16.0) for more details. + - The `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed. - The `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service. diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index ca2e911597296..2c19fb8a029d3 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -42,8 +42,8 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = with types; attrsOf (oneOf [ (listOf str) str path ]); - apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}"); + type = with types; attrsOf (oneOf [ (listOf (oneOf [ float int str ])) float int str path ]); + apply = mapAttrs (n: v: if isList v then concatMapStringsSep ":" toString v else toString v); }; environment.profiles = mkOption { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e92cbe31e25ac..5ea9121b7f445 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -179,6 +179,7 @@ ./programs/environment.nix ./programs/evince.nix ./programs/extra-container.nix + ./programs/fcast-receiver.nix ./programs/feedbackd.nix ./programs/file-roller.nix ./programs/firefox.nix diff --git a/nixos/modules/programs/fcast-receiver.nix b/nixos/modules/programs/fcast-receiver.nix new file mode 100644 index 0000000000000..8da07a66e2223 --- /dev/null +++ b/nixos/modules/programs/fcast-receiver.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.fcast-receiver; +in +{ + meta = { + maintainers = pkgs.fcast-receiver.meta.maintainers; + }; + + options.programs.fcast-receiver = { + enable = mkEnableOption (lib.mdDoc "FCast Receiver"); + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Open ports needed for the functionality of the program. + ''; + }; + package = mkPackageOption pkgs "fcast-receiver" { }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 46899 ]; + }; + }; +} diff --git a/nixos/modules/programs/soundmodem.nix b/nixos/modules/programs/soundmodem.nix index 59c1f2fb2dedd..ab992c63c6088 100644 --- a/nixos/modules/programs/soundmodem.nix +++ b/nixos/modules/programs/soundmodem.nix @@ -11,7 +11,7 @@ in enable = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = '' Whether to add Soundmodem to the global environment and configure a wrapper for 'soundmodemconfig' for users in the 'soundmodem' group. ''; @@ -21,7 +21,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ soundmodem ]; + environment.systemPackages = [ cfg.package ]; users.groups.soundmodem = { }; security.wrappers.soundmodemconfig = { diff --git a/nixos/modules/services/audio/gonic.nix b/nixos/modules/services/audio/gonic.nix index 3dfa24b7fc68a..15a35571acbab 100644 --- a/nixos/modules/services/audio/gonic.nix +++ b/nixos/modules/services/audio/gonic.nix @@ -55,6 +55,9 @@ in RuntimeDirectory = "gonic"; RootDirectory = "/run/gonic"; ReadWritePaths = ""; + BindPaths = [ + cfg.settings.playlists-path + ]; BindReadOnlyPaths = [ # gonic can access scrobbling services "-/etc/resolv.conf" diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 4f8ca85a74329..3db6616442816 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -401,17 +401,19 @@ in })) ]; - environment.etc = - { - "udev/rules.d".source = udevRulesFor { - name = "udev-rules"; - udevPackages = cfg.packages; - systemd = config.systemd.package; - binPackages = cfg.packages; - inherit udevPath udev; - }; - "udev/hwdb.bin".source = hwdbBin; + environment.etc = { + "udev/rules.d".source = udevRulesFor { + name = "udev-rules"; + udevPackages = cfg.packages; + systemd = config.systemd.package; + binPackages = cfg.packages; + inherit udevPath udev; }; + "udev/hwdb.bin".source = hwdbBin; + } // lib.optionalAttrs config.boot.modprobeConfig.enable { + # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat. + "modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; + }; system.requiredKernelConfig = with config.lib.kernelConfig; [ (isEnabled "UNIX") @@ -419,21 +421,17 @@ in (isYes "NET") ]; - # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat. - environment.etc."modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; - - system.activationScripts.udevd = - '' - # The deprecated hotplug uevent helper is not used anymore - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" > /proc/sys/kernel/hotplug - fi + system.activationScripts.udevd = lib.mkIf config.boot.kernel.enable '' + # The deprecated hotplug uevent helper is not used anymore + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" > /proc/sys/kernel/hotplug + fi - # Allow the kernel to find our firmware. - if [ -e /sys/module/firmware_class/parameters/path ]; then - echo -n "${config.hardware.firmware}/lib/firmware" > /sys/module/firmware_class/parameters/path - fi - ''; + # Allow the kernel to find our firmware. + if [ -e /sys/module/firmware_class/parameters/path ]; then + echo -n "${config.hardware.firmware}/lib/firmware" > /sys/module/firmware_class/parameters/path + fi + ''; systemd.services.systemd-udevd = { restartTriggers = cfg.packages; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index a9eab3e7055cc..2dc12a221bf06 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -31,6 +31,7 @@ let "collectd" "dmarc" "dnsmasq" + "dnssec" "domain" "dovecot" "fastly" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnssec.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnssec.nix new file mode 100644 index 0000000000000..dda1ad1988a61 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dnssec.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.prometheus.exporters.dnssec; + configFormat = pkgs.formats.toml { }; + configFile = configFormat.generate "dnssec-checks.toml" cfg.configuration; +in { + port = 9204; + extraOpts = { + configuration = lib.mkOption { + type = lib.types.nullOr lib.types.attrs; + default = null; + description = '' + dnssec exporter configuration as nix attribute set. + + See <https://github.com/chrj/prometheus-dnssec-exporter/blob/master/README.md> + for the description of the configuration file format. + ''; + example = lib.literalExpression '' + { + records = [ + { + zone = "ietf.org"; + record = "@"; + type = "SOA"; + } + { + zone = "verisigninc.com"; + record = "@"; + type = "SOA"; + } + ]; + } + ''; + }; + + listenAddress = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Listen address as host IP and port definition. + ''; + example = ":9204"; + }; + + resolvers = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + DNSSEC capable resolver to be used for the check. + ''; + example = [ "0.0.0.0:53" ]; + }; + + timeout = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + DNS request timeout duration. + ''; + example = "10s"; + }; + + extraFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Extra commandline options when launching Prometheus. + ''; + }; + }; + + serviceOpts = { + serviceConfig = let + startScript = pkgs.writeShellScriptBin "prometheus-dnssec-exporter-start" + "${lib.concatStringsSep " " + ([ "${pkgs.prometheus-dnssec-exporter}/bin/prometheus-dnssec-exporter" ] + ++ lib.optionals (cfg.configuration != null) + [ "-config ${configFile}" ] + ++ lib.optionals (cfg.listenAddress != null) + [ "-listen-address ${lib.escapeShellArg cfg.listenAddress}" ] + ++ lib.optionals (cfg.resolvers != [ ]) [ + "-resolvers ${ + lib.escapeShellArg (lib.concatStringsSep "," cfg.resolvers) + }" + ] ++ lib.optionals (cfg.timeout != null) + [ "-timeout ${lib.escapeShellArg cfg.timeout}" ] ++ cfg.extraFlags)}"; + in { ExecStart = lib.getExe startScript; }; + }; +} + diff --git a/nixos/modules/services/networking/deconz.nix b/nixos/modules/services/networking/deconz.nix index 05b7247087771..eaa7759d0407c 100644 --- a/nixos/modules/services/networking/deconz.nix +++ b/nixos/modules/services/networking/deconz.nix @@ -93,6 +93,13 @@ in # be garbage collected. Ensure the file gets "refreshed" on every start. rm -f ${stateDir}/.local/share/dresden-elektronik/deCONZ/zcldb.txt ''; + postStart = '' + # Delay signalling service readiness until it's actually up. + while ! "${lib.getExe pkgs.curl}" -sSfl -o /dev/null "http://${cfg.listenAddress}:${toString cfg.httpPort}"; do + echo "Waiting for TCP port ${toString cfg.httpPort} to be open..." + sleep 1 + done + ''; environment = { HOME = stateDir; XDG_RUNTIME_DIR = "/run/${name}"; diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 016c4202e4b3b..77c5ecb246171 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -268,11 +268,11 @@ in script = let - userScriptArgs = ''--user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"''; - updateUserScript = optionalString (cfg.authType == "form") '' + userScriptArgs = ''--user ${cfg.defaultUser} ${optionalString (cfg.authType == "form") ''--password "$(cat ${cfg.passwordFile})"''}''; + updateUserScript = optionalString (cfg.authType == "form" || cfg.authType == "none") '' ./cli/update-user.php ${userScriptArgs} ''; - createUserScript = optionalString (cfg.authType == "form") '' + createUserScript = optionalString (cfg.authType == "form" || cfg.authType == "none") '' ./cli/create-user.php ${userScriptArgs} ''; in diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 3d1a00ccde7c9..40470f535bf61 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -164,7 +164,7 @@ let ${commonHttpConfig} ${optionalString (cfg.resolver.addresses != []) '' - resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"} ${optionalString (!cfg.resolver.ipv6) "ipv6=off"}; + resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"} ${optionalString (!cfg.resolver.ipv4) "ipv4=off"} ${optionalString (!cfg.resolver.ipv6) "ipv6=off"}; ''} ${upstreamConfig} @@ -978,6 +978,15 @@ in An optional valid parameter allows overriding it ''; }; + ipv4 = mkOption { + type = types.bool; + default = true; + description = '' + By default, nginx will look up both IPv4 and IPv6 addresses while resolving. + If looking up of IPv4 addresses is not desired, the ipv4=off parameter can be + specified. + ''; + }; ipv6 = mkOption { type = types.bool; default = true; @@ -1179,6 +1188,13 @@ in to answer to ACME requests. ''; } + + { + assertion = cfg.resolver.ipv4 || cfg.resolver.ipv6; + message = '' + At least one of services.nginx.resolver.ipv4 and services.nginx.resolver.ipv6 must be true. + ''; + } ] ++ map (name: mkCertOwnershipAssertion { inherit (cfg) group user; cert = config.security.acme.certs.${name}; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a99fedaddd763..a2011bc836e8e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -330,6 +330,7 @@ in { freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; freshrss-http-auth = handleTest ./freshrss-http-auth.nix {}; + freshrss-none-auth = handleTest ./freshrss-none-auth.nix {}; frigate = handleTest ./frigate.nix {}; frp = handleTest ./frp.nix {}; frr = handleTest ./frr.nix {}; diff --git a/nixos/tests/freshrss-none-auth.nix b/nixos/tests/freshrss-none-auth.nix new file mode 100644 index 0000000000000..fd63470386a05 --- /dev/null +++ b/nixos/tests/freshrss-none-auth.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "freshrss"; + meta.maintainers = with lib.maintainers; [ mattchrist ]; + + nodes.machine = { pkgs, ... }: { + services.freshrss = { + enable = true; + baseUrl = "http://localhost"; + authType = "none"; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(80) + response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/") + assert '<title>Main stream · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully" + ''; +}) diff --git a/nixos/tests/gonic.nix b/nixos/tests/gonic.nix index 726d7da0970f7..adf0f511a9cf7 100644 --- a/nixos/tests/gonic.nix +++ b/nixos/tests/gonic.nix @@ -2,11 +2,19 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "gonic"; nodes.machine = { ... }: { + systemd.tmpfiles.settings = { + "10-gonic" = { + "/tmp/music"."d" = {}; + "/tmp/podcast"."d" = {}; + "/tmp/playlists"."d" = {}; + }; + }; services.gonic = { enable = true; settings = { - music-path = [ "/tmp" ]; - podcast-path = "/tmp"; + music-path = [ "/tmp/music" ]; + podcast-path = "/tmp/podcast"; + playlists-path = "/tmp/playlists"; }; }; }; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 3dc368e320ff2..576253450814f 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -227,6 +227,54 @@ let ''; }; + dnssec = { + exporterConfig = { + enable = true; + configuration = { + records = [ + { + zone = "example.com"; + record = "@"; + type = "SOA"; + } + ]; + }; + resolvers = [ "127.0.0.1:53" ]; + }; + metricProvider = { + services.knot = { + enable = true; + settingsFile = pkgs.writeText "knot.conf" '' + server: + listen: 127.0.0.1@53 + template: + - id: default + storage: ${pkgs.buildEnv { + name = "zones"; + paths = [(pkgs.writeTextDir "example.com.zone" '' + @ SOA ns1.example.com. noc.example.com. 2024032401 86400 7200 3600000 172800 + @ NS ns1 + ns1 A 192.168.0.1 + '')]; + }} + zonefile-load: difference + zonefile-sync: -1 + zone: + - domain: example.com + file: example.com.zone + dnssec-signing: on + ''; + }; + }; + exporterTest = '' + wait_for_unit("knot.service") + wait_for_open_port(53) + wait_for_unit("prometheus-dnssec-exporter.service") + wait_for_open_port(9204) + succeed("curl -sSf http://localhost:9204/metrics | grep 'example.com'") + ''; + }; + # Access to WHOIS server is required to properly test this exporter, so # just perform basic sanity check that the exporter is running and returns # a failure. diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 08ef2d0830887..517db11c2865f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 -, python3Packages , meson, ninja }: +{ lib, stdenv, fetchFromGitea, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 +, python3Packages , meson, ninja, gitUpdater }: stdenv.mkDerivation rec { pname = "a2jmidid"; - version = "9"; + version = "12"; - src = fetchFromGitHub { - owner = "linuxaudio"; - repo = pname; - rev = version; - sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; + src = fetchFromGitea { + domain = "gitea.ladish.org"; + owner = "LADI"; + repo = "a2jmidid"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; @@ -21,9 +23,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control" ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; - license = licenses.gpl2; + homepage = "https://a2jmidid.ladish.org/"; + license = licenses.gpl2Only; maintainers = [ maintainers.goibhniu ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; diff --git a/pkgs/applications/audio/muzika/default.nix b/pkgs/applications/audio/muzika/default.nix index 86a3f19619831..d3b4e3d274522 100644 --- a/pkgs/applications/audio/muzika/default.nix +++ b/pkgs/applications/audio/muzika/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , gjs , glib-networking , gobject-introspection @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ninja nodejs pkg-config - prefetch-yarn-deps + fixup-yarn-lock wrapGAppsHook4 yarn ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 9464a0d7d1dc5..b53879974d00d 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeDesktopItem , copyDesktopItems -, prefetch-yarn-deps +, fixup-yarn-lock , makeWrapper , autoSignDarwinBinariesHook , nodejs @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock makeWrapper nodejs yarn diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index d63c0874171e4..2b53e1efa9305 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, prefetch-yarn-deps, callPackage, nodejs }: +{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs }: let common = callPackage ./common.nix { }; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs nodejs.pkgs.yarn ]; diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 61e704c9e806a..9edb3d882acb3 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.13"; + version = "13.0.14"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-CAJJs14U9zsl5PiyZIwXYZG4dZz+Cqn7sD9u3S+/WvA="; + hash = "sha256-z7fZtq+jnoAi6G8RNahGtP1LXeOXU/2wYz5ha2ddAeM="; }; }; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 425e06051b59f..851f2c49f280b 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.13"; + version = "13.0.14"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-l7Ka8vjVX67ZPPzRnQixtki5/cYhP6P/J91CyGPnwfI="; + hash = "sha256-UWR2zMVXa6QMz1EIWJf43Vmj14ZIaug105esxeSd0KU="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-Ro9F3SZiagtj3AnDOtHmyy1G/KOi/O9M3f775qrZig4="; + hash = "sha256-n+qj3IY4z+erOg4iUkQ4CP3rtJASTeKPg7beZRdesw4="; }; }; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 11666ef5c0bf7..8f158f1cd5e80 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.29.3"; + version = "1.29.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-mtYxFy2d892uMLrtaR6ao07gjbThuGa7bzauwvJ0WOo="; + hash = "sha256-7Rxbcsl77iFiHkU/ovyn74aXs/i5G/m5h5Ii0y1CRho="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/applications/networking/cluster/tilt/assets.nix index 6bc70de3213f7..8fafcf666d8d2 100644 --- a/pkgs/applications/networking/cluster/tilt/assets.nix +++ b/pkgs/applications/networking/cluster/tilt/assets.nix @@ -2,7 +2,7 @@ , stdenvNoCC , version, src , fetchYarnDeps -, prefetch-yarn-deps, yarn, nodejs +, fixup-yarn-lock, yarn, nodejs }: stdenvNoCC.mkDerivation rec { @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { inherit src version; - nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; + nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/web/yarn.lock"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ffbee0f25f828..3fcbfcbf4649c 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeWrapper , makeDesktopItem -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , nodejs , fetchYarnDeps @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = desktopYarnHash; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper jq ] + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs makeWrapper jq ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; inherit seshat; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 343c21d64730c..2d69022ec35df 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -6,7 +6,7 @@ , writeText , jq , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , jitsi-meet }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = webYarnHash; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; + nativeBuildInputs = [ yarn fixup-yarn-lock jq nodejs ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 980e22c0c3e30..ed6b5ebe72a65 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, prefetch-yarn-deps, CoreServices, fetchYarnDeps, removeReferencesTo }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup-yarn-lock, CoreServices, fetchYarnDeps, removeReferencesTo }: let pinData = lib.importJSON ./pin.json; @@ -16,7 +16,7 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/seshat-node/native"; - nativeBuildInputs = [ nodejs python3 yarn prefetch-yarn-deps ]; + nativeBuildInputs = [ nodejs python3 yarn fixup-yarn-lock ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; npm_config_nodedir = nodejs; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 2debdc6140d2b..7a3ad36e47b74 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 037d27cf06602..6c976fdd0a433 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -7,7 +7,7 @@ , yarn , nodejs , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , electron , libnotify , libpulseaudio @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jBwyIyiWeqNmOnxmVOr7c4oMWwHElEjM25sShhTMi78="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs copyDesktopItems makeWrapper ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index f309da11df854..1078f515c69ac 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , nodejs , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , python3 , npmHooks , darwin @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; }; - nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ sqlite ]; configurePhase = '' diff --git a/pkgs/applications/radio/openwebrx/default.nix b/pkgs/applications/radio/openwebrx/default.nix index b85d02ce042eb..0d65fe8e629b8 100644 --- a/pkgs/applications/radio/openwebrx/default.nix +++ b/pkgs/applications/radio/openwebrx/default.nix @@ -62,13 +62,13 @@ let in buildPythonApplication rec { pname = "openwebrx"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "sha256-7gcgwa9vQT2u8PQusuXKted2Hk0K+Zk6ornSG1K/D4c="; + hash = "sha256-i3Znp5Sxs/KtJazHh2v9/2P+3cEocWB5wIpF7E4pK9s="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 58f38ec1d5340..44f38a99a528d 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.17.1"; + version = "1.17.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-B6RhzsOPwczPLJRx3gBFZZvklwx9IwqplRG2vsAPIlg="; + hash = "sha256-p+qaWHBrUn6YpNyAmQf6XoQyO3degHP5oMN53/9gIr4="; }; separateDebugInfo = true; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ad63b76f114f7..2e440e2b9766d 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -2,7 +2,7 @@ , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , defaultGemConfig, buildRubyGem , gitlabEnterprise ? false, callPackage, yarn -, prefetch-yarn-deps, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config +, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config , cargo, rustc, rustPlatform }: @@ -94,7 +94,7 @@ let sha256 = data.yarn_hash; }; - nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert prefetch-yarn-deps ]; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert fixup-yarn-lock ]; patches = [ # Since version 12.6.0, the rake tasks need the location of git, diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 0d99b350c0b82..c5f2adf153f56 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -13,7 +13,7 @@ , fetchYarnDeps , yarn , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , glibcLocales , libiconv , Cocoa @@ -66,7 +66,7 @@ let inherit version; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs yarn ]; diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 80c013becb405..fdf8294013990 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , makeWrapper , copyDesktopItems @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn - prefetch-yarn-deps + fixup-yarn-lock nodejs makeWrapper copyDesktopItems diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index b3ea9bd94a92a..0547a30688c22 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,9 +17,12 @@ , makeWrapper , runtimeShell , symlinkJoin +, substituteAll , extraPackages ? [ ] , runc , crun +, gvisor +, youki , conmon , slirp4netns , fuse-overlayfs @@ -30,6 +33,7 @@ , gvproxy , aardvark-dns , netavark +, passt , testers , podman }: @@ -37,9 +41,6 @@ let # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed binPath = lib.makeBinPath (lib.optionals stdenv.isLinux [ - runc - crun - conmon fuse-overlayfs util-linux iptables @@ -57,21 +58,27 @@ let catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark slirp4netns + passt ]; }; in buildGoModule rec { pname = "podman"; - version = "4.9.3"; + version = "5.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-PdAXcXtc/Jl3ttWWB6TciiOwWescJ51Glhf2ZhOw550="; + hash = "sha256-XgLrPLswLmaB9FYXKEMLP+7KT/OY50z3JKz8DvMLrEE="; }; patches = [ + (substituteAll { + src = ./hardcode-paths.patch; + inherit crun runc gvisor youki conmon; + }) + # we intentionally don't build and install the helper so we shouldn't display messages to users about it ./rm-podman-mac-helper-msg.patch ]; diff --git a/pkgs/applications/virtualization/podman/hardcode-paths.patch b/pkgs/applications/virtualization/podman/hardcode-paths.patch new file mode 100644 index 0000000000000..05394f62877a1 --- /dev/null +++ b/pkgs/applications/virtualization/podman/hardcode-paths.patch @@ -0,0 +1,109 @@ +diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go +index 19c4bb6bf..2743de4b2 100644 +--- a/vendor/github.com/containers/common/pkg/config/default.go ++++ b/vendor/github.com/containers/common/pkg/config/default.go +@@ -364,75 +364,34 @@ func defaultEngineConfig() (*EngineConfig, error) { + c.Retry = 3 + c.OCIRuntimes = map[string][]string{ + "crun": { +- "/usr/bin/crun", +- "/usr/sbin/crun", +- "/usr/local/bin/crun", +- "/usr/local/sbin/crun", +- "/sbin/crun", +- "/bin/crun", +- "/run/current-system/sw/bin/crun", ++ "@crun@/bin/crun", + }, + "crun-vm": { +- "/usr/bin/crun-vm", +- "/usr/local/bin/crun-vm", +- "/usr/local/sbin/crun-vm", +- "/sbin/crun-vm", +- "/bin/crun-vm", +- "/run/current-system/sw/bin/crun-vm", ++ // TODO: "@crun-vm@/bin/crun-vm", + }, + "crun-wasm": { +- "/usr/bin/crun-wasm", +- "/usr/sbin/crun-wasm", +- "/usr/local/bin/crun-wasm", +- "/usr/local/sbin/crun-wasm", +- "/sbin/crun-wasm", +- "/bin/crun-wasm", +- "/run/current-system/sw/bin/crun-wasm", ++ // TODO: "@crun-wasm@/bin/crun-wasm", + }, + "runc": { +- "/usr/bin/runc", +- "/usr/sbin/runc", +- "/usr/local/bin/runc", +- "/usr/local/sbin/runc", +- "/sbin/runc", +- "/bin/runc", +- "/usr/lib/cri-o-runc/sbin/runc", +- "/run/current-system/sw/bin/runc", ++ "@runc@/bin/runc", + }, + "runj": { +- "/usr/local/bin/runj", ++ // TODO: "@runj@/bin/runj", + }, + "kata": { +- "/usr/bin/kata-runtime", +- "/usr/sbin/kata-runtime", +- "/usr/local/bin/kata-runtime", +- "/usr/local/sbin/kata-runtime", +- "/sbin/kata-runtime", +- "/bin/kata-runtime", +- "/usr/bin/kata-qemu", +- "/usr/bin/kata-fc", ++ // TODO: "@kata@/bin/kata", + }, + "runsc": { +- "/usr/bin/runsc", +- "/usr/sbin/runsc", +- "/usr/local/bin/runsc", +- "/usr/local/sbin/runsc", +- "/bin/runsc", +- "/sbin/runsc", +- "/run/current-system/sw/bin/runsc", ++ "@gvisor@/bin/runsc", + }, + "youki": { +- "/usr/local/bin/youki", +- "/usr/bin/youki", +- "/bin/youki", +- "/run/current-system/sw/bin/youki", ++ "@youki@/bin/youki", + }, + "krun": { +- "/usr/bin/krun", +- "/usr/local/bin/krun", ++ // TODO: "@krun@/bin/krun", + }, + "ocijail": { +- "/usr/local/bin/ocijail", ++ // TODO: "@ocijail@/bin/ocijail", + }, + } + c.PlatformToOCIRuntime = map[string]string{ +@@ -443,16 +402,9 @@ func defaultEngineConfig() (*EngineConfig, error) { + // Needs to be called after populating c.OCIRuntimes. + c.OCIRuntime = c.findRuntime() + +- c.ConmonEnvVars.Set([]string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"}) ++ c.ConmonEnvVars.Set([]string{}) + c.ConmonPath.Set([]string{ +- "/usr/libexec/podman/conmon", +- "/usr/local/libexec/podman/conmon", +- "/usr/local/lib/podman/conmon", +- "/usr/bin/conmon", +- "/usr/sbin/conmon", +- "/usr/local/bin/conmon", +- "/usr/local/sbin/conmon", +- "/run/current-system/sw/bin/conmon", ++ "@conmon@/bin/conmon", + }) + c.ConmonRsPath.Set([]string{ + "/usr/libexec/podman/conmonrs", diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 179ce41f02b27..4cc253c4c68f0 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,8 +1,22 @@ diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go -index 4e43dd54c..a981d93bf 100644 +index 1afc3d15b..a8aafcaae 100644 --- a/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go -@@ -127,14 +127,6 @@ address can't be used by podman. ` +@@ -33,13 +33,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) { + // WaitAPIAndPrintInfo prints info about the machine and does a ping test on the + // API socket + func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) { +- suffix := "" + var fmtString string + +- if name != DefaultMachineName { +- suffix = " " + name +- } +- + if forwardState == NoForwarding { + return + } +@@ -61,14 +56,6 @@ address can't be used by podman. ` if len(helper) < 1 { fmt.Print(fmtString) @@ -12,7 +26,7 @@ index 4e43dd54c..a981d93bf 100644 - sudo %s install - podman machine stop%[2]s; podman machine start%[2]s - -- ` +-` - fmt.Printf(fmtString, helper, suffix) } case MachineLocal: diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index e837f7457d176..7f0e0692f81f6 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -13,29 +13,49 @@ in { name = "prefetch-yarn-deps"; dontUnpack = true; + dontBuild = true; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ coreutils nix-prefetch-git nodejs-slim nix ]; + buildInputs = [ nodejs-slim ]; - buildPhase = '' - runHook preBuild + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/libexec - mkdir libexec tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js - mv index.js libexec/yarnpkg-lockfile.js - cp ${./.}/*.js libexec/ - patchShebangs libexec + mv index.js $out/libexec/yarnpkg-lockfile.js + cp ${./.}/common.js ${./.}/index.js $out/libexec/ + + patchShebangs $out/libexec + makeWrapper $out/libexec/index.js $out/bin/prefetch-yarn-deps \ + --prefix PATH : ${lib.makeBinPath [ coreutils nix-prefetch-git nix ]} - runHook postBuild + runHook postInstall ''; + passthru = { inherit tests; }; + }; + + fixup-yarn-lock = stdenv.mkDerivation { + name = "fixup-yarn-lock"; + + dontUnpack = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ nodejs-slim ]; + installPhase = '' runHook preInstall - mkdir -p $out/bin - cp -r libexec $out - makeWrapper $out/libexec/index.js $out/bin/prefetch-yarn-deps \ - --prefix PATH : ${lib.makeBinPath [ coreutils nix-prefetch-git nix ]} + mkdir -p $out/bin $out/libexec + + tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js + mv index.js $out/libexec/yarnpkg-lockfile.js + cp ${./.}/common.js ${./.}/fixup.js $out/libexec/ + + patchShebangs $out/libexec makeWrapper $out/libexec/fixup.js $out/bin/fixup-yarn-lock runHook postInstall diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix index 28feed78cc49b..14d71aafe6811 100644 --- a/pkgs/by-name/ae/aeron-cpp/package.nix +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -1,5 +1,6 @@ { autoPatchelfHook, + aeron, cmake, fetchFromGitHub, fetchMavenArtifact, @@ -14,23 +15,16 @@ }: let - version = "1.42.1"; + version = aeron.version; - aeronAll = fetchMavenArtifact { - artifactId = "aeron-all"; - groupId = "io.aeron"; - inherit version; - hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; - }; - - sbeAll_1_29_0 = fetchMavenArtifact { + sbeAll_1_30_0 = fetchMavenArtifact { groupId = "uk.co.real-logic"; - version = "1.29.0"; + version = "1.30.0"; artifactId = "sbe-all"; - hash = "sha512-exklKS9MgOH369lyuv+5vAWRHt+Iwg/FmsWy8PsSMjenvjs8I2KA1VTa00pIXkw/YNqbUDBIWvS07b4mS8YdPQ=="; + hash = "sha512-K/LMP6zNBHl2Wpvli/sH+ZsYwlTPJHHCKee7riOH6dR8nxTJgucnF7AsbVOpowR6xaV3wPjFh0iqWp/oerHKBg=="; }; - sbeAll = sbeAll_1_29_0; + sbeAll = sbeAll_1_30_0; in @@ -42,7 +36,7 @@ stdenv.mkDerivation { owner = "real-logic"; repo = "aeron"; rev = version; - hash = "sha256-ODJeJ4XLazPeNLdzaoclPnE59NpxFUqZu3Aw3iTVQT8="; + hash = "sha256-MY7I8Cw1izVLW3/JWav9zPIBJTGInZHwAZT2e7tI9F0="; }; patches = [ @@ -54,7 +48,6 @@ stdenv.mkDerivation { ]; buildInputs = [ - jdk11 libbsd libuuid zlib @@ -63,6 +56,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook cmake + jdk11 makeWrapper patchelf ]; @@ -89,7 +83,7 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild - ln --symbolic "${aeronAll.jar}" ./aeron-all.jar + ln --symbolic "${aeron.jar}" ./aeron-all.jar ln --symbolic "${sbeAll.jar}" ./sbe.jar mkdir --parents aeron-all/build/libs ( diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix new file mode 100644 index 0000000000000..ff2dff5dc4d56 --- /dev/null +++ b/pkgs/by-name/an/antares/package.nix @@ -0,0 +1,49 @@ +{ fetchFromGitHub +, lib +, buildNpmPackage +, electron +, nodejs +}: + +buildNpmPackage rec { + pname = "antares"; + version = "0.7.22"; + + src = fetchFromGitHub { + owner = "antares-sql"; + repo = "antares"; + rev = "v${version}"; + hash = "sha256-SYnhrwxoyVw+bwfN1PGMsoul+mTfi8UkiP0fNOvVTBc="; + }; + + npmDepsHash = "sha256-5khFw8Igu2d5SYLh7OiCpUDMOVH5gAje+VnvoESQboo="; + + buildInputs = [ nodejs ]; + + buildPhase = '' + runHook preBuild + npm run compile + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + npmInstallHook + cp -rf dist/* $out/lib/node_modules/antares + find -name "*.ts" | xargs rm -f + makeWrapper ${lib.getExe electron} $out/bin/antares \ + --add-flags $out/lib/node_modules/antares/main.js + runHook postInstall + ''; + + dontNpmBuild = true; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; + + meta = with lib; { + description = "Modern, fast and productivity driven SQL client with a focus in UX"; + homepage = "https://github.com/antares-sql/antares"; + license = licenses.mit; + maintainers = with maintainers; [ eymeric ]; + }; +} diff --git a/pkgs/by-name/aw/aws-azure-login/package.nix b/pkgs/by-name/aw/aws-azure-login/package.nix index 099726ba9e8d1..fc693e3eed012 100644 --- a/pkgs/by-name/aw/aws-azure-login/package.nix +++ b/pkgs/by-name/aw/aws-azure-login/package.nix @@ -6,7 +6,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index c700c9dd8fdf2..301784a8c654b 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -45,9 +45,10 @@ rustPlatform.buildRustPackage { glib gtk4 pango - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + AppKit + ]); nativeCheckInputs = [ xvfb-run diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index aaf4f562e06ff..20eebbc9d5ab3 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchYarnDeps , fetchFromGitHub -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , python3 , makeWrapper @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Wy0UP8QaQzZ1par7W5UhnRLc5DF2PAif0JIZJtRokBk="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps python3 makeWrapper ]; + nativeBuildInputs = [ yarn fixup-yarn-lock python3 makeWrapper ]; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/fc/fcast-receiver/package.nix b/pkgs/by-name/fc/fcast-receiver/package.nix new file mode 100644 index 0000000000000..9aa649d34f8ca --- /dev/null +++ b/pkgs/by-name/fc/fcast-receiver/package.nix @@ -0,0 +1,64 @@ +{ lib +, buildNpmPackage +, fetchFromGitLab +, makeDesktopItem +, copyDesktopItems +, makeWrapper +, electron +}: + +buildNpmPackage rec { + pname = "fcast-receiver"; + version = "1.0.14"; + + src = fetchFromGitLab { + domain = "gitlab.futo.org"; + owner = "videostreaming"; + repo = "fcast"; + rev = "c7a1cb27c470870df50dbf0de00a133061298d46"; + hash = "sha256-9xF1DZ2wt6zMoUQywmvnNN3Z8m4GhOFJElENhozF9c8="; + }; + + sourceRoot = "${src.name}/receivers/electron"; + + makeCacheWritable = true; + + npmDepsHash = "sha256-gpbFZ8rKYR/GUY1l4eH5io/lz6FpJLUTl5h8q3haxvw="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "FCast Receiver"; + genericName = "Media Streaming Receiver"; + exec = "fcast-receiver"; + icon = "fcast-receiver"; + comment = "FCast Receiver, an open-source media streaming receiver"; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + postInstall = '' + install -Dm644 $out/lib/node_modules/fcast-receiver/app.png $out/share/pixmaps/fcast-receiver.png + + makeWrapper ${electron}/bin/electron $out/bin/fcast-receiver \ + --add-flags $out/lib/node_modules/fcast-receiver/dist/bundle.js + ''; + + meta = with lib; { + description = "FCast Receiver, an open-source media streaming receiver"; + longDescription = '' + FCast Receiver is a receiver for an open-source media streaming protocol, FCast, an alternative to Chromecast and AirPlay. + ''; + homepage = "https://fcast.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ ymstnt ]; + mainProgram = "fcast-receiver"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix index 3de9736128572..de0c7706af6f7 100644 --- a/pkgs/by-name/fe/fernglas/package.nix +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -3,7 +3,7 @@ , rustPlatform , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , python3 , jq , yarn @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0wj5AS8RLVr+S/QWWxCsMvmVjmXUWGfR9kPaZimJEss="; }; - nativeBuildInputs = [ yarn nodejs-slim prefetch-yarn-deps python3 jq ]; + nativeBuildInputs = [ yarn nodejs-slim fixup-yarn-lock python3 jq ]; nlnog_communities = fetchFromGitHub { owner = "NLNOG"; diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix index 79a801000ad1b..2534fa745cd77 100644 --- a/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , testers }: @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 89f4e6e6e04ba..246e3879bb5cf 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -1,21 +1,22 @@ -{ config -, fetchFromGitHub -, hidapi -, kmod -, lib -, python3 -, toybox +{ + config, + fetchFromGitHub, + hidapi, + kmod, + lib, + python3, + toybox, }: python3.pkgs.buildPythonApplication rec { pname = "handheld-daemon"; - version = "1.1.0"; + version = "2.6.4"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; rev = "v${version}"; - hash = "sha256-ovLC1BQ98jUaDEMPBzWma4TYSzTF+yE/cMemFdJmqlE="; + hash = "sha256-S77APtE1GGfqnv1IkZdJOSlprPOBtrqVXV60yVMvopg="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -26,17 +27,22 @@ python3.pkgs.buildPythonApplication rec { rich setuptools toybox + xlib ]; # This package doesn't have upstream tests. doCheck = false; - # handheld-daemon contains a fork of the python module `hid`, so this hook - # is borrowed from the `hid` derivation. postPatch = '' - hidapi=${ hidapi }/lib/ + # handheld-daemon contains a fork of the python module `hid`, so this hook + # is borrowed from the `hid` derivation. + hidapi=${hidapi}/lib/ test -d $hidapi || { echo "ERROR: $hidapi doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|libhidapi|$hidapi/libhidapi|" src/hhd/controller/lib/hid.py + + # The generated udev rules point to /bin/chmod, which does not exist in NixOS + chmod=${toybox}/bin/chmod + sed -i -e "s|/bin/chmod|$chmod|" src/hhd/controller/lib/hide.py ''; postInstall = '' diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus/ui.nix index ec7518ef83ad8..5d2d248d6940e 100644 --- a/pkgs/by-name/in/incus/ui.nix +++ b/pkgs/by-name/in/incus/ui.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , nixosTests , git @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn git ]; diff --git a/pkgs/by-name/li/libsignal-ffi/Cargo.lock b/pkgs/by-name/li/libsignal-ffi/Cargo.lock index 3f48ef1121a38..4868f16b1ec0d 100644 --- a/pkgs/by-name/li/libsignal-ffi/Cargo.lock +++ b/pkgs/by-name/li/libsignal-ffi/Cargo.lock @@ -29,9 +29,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -100,9 +100,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "argon2" @@ -185,22 +185,22 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3ecbce89a22627b5e8e6e11d69715617138290289e385cde773b1fe50befdb" +checksum = "889adc8fd6c1344619926529e605cccad1f832b3a2a5a3fe6d7c8557c8f05368" dependencies = [ "asn1_derive", ] [[package]] name = "asn1_derive" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "861af988fac460ac69a09f41e6217a8fb9178797b76fcc9478444be6a59be19c" +checksum = "e2271cec9b830009b9c3b9e21767083c553f51f996b690c476c27f541199aa99" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -245,7 +245,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -253,6 +253,8 @@ name = "attest" version = "0.1.0" dependencies = [ "asn1", + "assert_matches", + "base64", "bitflags 2.4.2", "boring", "chacha20poly1305", @@ -261,6 +263,7 @@ dependencies = [ "displaydoc", "hex", "hex-literal", + "hmac", "lazy_static", "libc", "log", @@ -272,9 +275,10 @@ dependencies = [ "sha2", "snow", "static_assertions", + "strum", "subtle", + "test-case", "uuid", - "variant_count", "x25519-dalek", ] @@ -337,7 +341,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -443,9 +447,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -454,15 +458,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -499,9 +503,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -554,24 +558,24 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.32" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits", + "num-traits 0.2.18", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -580,15 +584,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -662,7 +666,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -698,9 +702,9 @@ dependencies = [ [[package]] name = "const-str" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca749d3d3f5b87a0d6100509879f9cf486ab510803a4a4e1001da1ff61c2bd6" +checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" [[package]] name = "convert_case" @@ -735,9 +739,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -755,7 +759,7 @@ dependencies = [ "criterion-plot", "is-terminal", "itertools 0.10.5", - "num-traits", + "num-traits 0.2.18", "once_cell", "oorandom", "plotters", @@ -804,6 +808,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -848,7 +858,7 @@ source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve2551 dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -918,7 +928,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -993,18 +1003,18 @@ dependencies = [ [[package]] name = "dir-test" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d8143e44a15668bec3989643621c8cdcbbc53387dec04c2c0801c0d07c2db" +checksum = "6fc943f4c1320fad6dbfe6a00070d88480c4f343e917cd7d5c5e04856ee7026c" dependencies = [ "dir-test-macros", ] [[package]] name = "dir-test-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff4ea493e7938a68a1b71386e0328b96d4f2a17bd4dad7706a7493eb03fd27" +checksum = "8cce5926e6ae92adcff7412e08ad0268d7eab7d15c1be1da34b7e9469a2dacb9" dependencies = [ "glob", "proc-macro2", @@ -1020,7 +1030,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1064,15 +1074,15 @@ dependencies = [ [[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 = "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 = "encoding_rs" @@ -1084,6 +1094,24 @@ dependencies = [ ] [[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +dependencies = [ + "num-traits 0.1.43", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", +] + +[[package]] name = "env_logger" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1097,6 +1125,16 @@ dependencies = [ ] [[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "env_filter", + "log", +] + +[[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1120,9 +1158,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "fixedbitset" @@ -1164,7 +1202,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1254,7 +1292,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1310,9 +1348,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1342,8 +1380,8 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.5", "slab", "tokio", "tokio-util", @@ -1361,8 +1399,8 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 1.0.0", - "indexmap 2.1.0", + "http 1.1.0", + "indexmap 2.2.5", "slab", "tokio", "tokio-util", @@ -1371,9 +1409,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" @@ -1396,7 +1438,7 @@ dependencies = [ "base64", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -1408,7 +1450,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -1428,9 +1470,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1476,9 +1518,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", @@ -1487,9 +1529,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1503,7 +1545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -1514,18 +1556,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", ] [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", - "futures-util", - "http 1.0.0", + "futures-core", + "http 1.1.0", "http-body 1.0.0", "pin-project-lite", ] @@ -1559,7 +1601,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.3.24", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", @@ -1574,28 +1616,29 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", "futures-util", "h2 0.4.2", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "httparse", "itoa", "pin-project-lite", + "smallvec", "tokio", "want", ] [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1642,9 +1685,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1662,12 +1705,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", + "libc", "windows-sys 0.52.0", ] @@ -1691,9 +1734,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", ] @@ -1728,18 +1771,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1758,18 +1801,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -1791,11 +1834,12 @@ dependencies = [ "cfg-if", "derive-where", "device-transfer", + "displaydoc", "futures-util", "hex", "hkdf", "hmac", - "http 1.0.0", + "http 1.1.0", "jni", "libsignal-bridge-macros", "libsignal-message-backup", @@ -1812,6 +1856,7 @@ dependencies = [ "partial-default", "paste", "rand", + "rayon", "scopeguard", "serde", "serde_derive", @@ -1821,8 +1866,10 @@ dependencies = [ "signal-neon-futures", "signal-pin", "static_assertions", + "strum", "subtle", "test-case", + "thiserror", "tokio", "tokio-boring", "usernames", @@ -1837,7 +1884,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "syn-mid", ] @@ -1853,7 +1900,7 @@ dependencies = [ [[package]] name = "libsignal-ffi" -version = "0.41.0" +version = "0.44.0" dependencies = [ "async-trait", "attest", @@ -1875,7 +1922,7 @@ dependencies = [ [[package]] name = "libsignal-jni" -version = "0.41.0" +version = "0.44.0" dependencies = [ "async-trait", "cfg-if", @@ -1941,7 +1988,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "test-case", ] @@ -1960,21 +2007,22 @@ dependencies = [ "const-str", "derive-where", "displaydoc", - "env_logger", + "env_logger 0.10.2", "futures-util", "hex", "hex-literal", "hkdf", "hmac", - "http 1.0.0", + "http 1.1.0", "http-body-util", - "hyper 1.1.0", - "itertools 0.12.0", + "hyper 1.2.0", + "itertools 0.12.1", "lazy_static", "libsignal-core", "libsignal-svr3", "log", "nonzero_ext", + "num_enum", "pin-project-lite", "proptest", "proptest-state-machine", @@ -1982,12 +2030,15 @@ dependencies = [ "prost-build", "rand", "rand_core", + "rcgen", "rustls-native-certs", "serde", "serde_json", "sha2", "snow", + "strum", "thiserror", + "tls-parser", "tokio", "tokio-boring", "tokio-stream", @@ -2001,7 +2052,7 @@ dependencies = [ [[package]] name = "libsignal-node" -version = "0.41.0" +version = "0.44.0" dependencies = [ "async-trait", "cmake", @@ -2032,19 +2083,19 @@ dependencies = [ "curve25519-dalek", "derive-where", "displaydoc", - "env_logger", + "env_logger 0.10.2", "futures-util", "hex", "hex-literal", "hkdf", "hmac", - "indexmap 2.1.0", - "itertools 0.12.0", + "indexmap 2.2.5", + "itertools 0.12.1", "libsignal-core", "log", "num_enum", "pqcrypto-kyber 0.7.9", - "pqcrypto-kyber 0.8.0", + "pqcrypto-kyber 0.8.1", "pqcrypto-traits", "proptest", "prost", @@ -2074,7 +2125,7 @@ dependencies = [ "hex", "hex-literal", "hkdf", - "http 1.0.0", + "http 1.1.0", "nonzero_ext", "prost", "prost-build", @@ -2088,22 +2139,22 @@ dependencies = [ [[package]] name = "linkme" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b53ad6a33de58864705954edb5ad5d571a010f9e296865ed43dc72a5621b430" +checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff" +checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2124,9 +2175,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "log-panics" @@ -2191,7 +2242,7 @@ dependencies = [ "encoding_rs", "memmap2", "minidump-common", - "num-traits", + "num-traits 0.2.18", "procfs-core", "range-map", "scroll", @@ -2210,7 +2261,7 @@ dependencies = [ "bitflags 2.4.2", "debugid", "num-derive", - "num-traits", + "num-traits 0.2.18", "range-map", "scroll", "smart-default", @@ -2258,18 +2309,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.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -2317,7 +2368,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "memchr", @@ -2353,7 +2404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.52", "syn-mid", ] @@ -2368,6 +2419,28 @@ dependencies = [ ] [[package]] +name = "nom-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff943d68b88d0b87a6e0d58615e8fa07f9fd5a1319fa0a72efc1f62275c79a7" +dependencies = [ + "nom", + "nom-derive-impl", + "rustversion", +] + +[[package]] +name = "nom-derive-impl" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b9a93a84b0d3ec3e70e02d332dc33ac6dfac9cde63e17fcb77172dededa62" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "nonzero_ext" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2387,24 +2460,32 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", - "num-traits", + "num-traits 0.2.18", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.18", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2438,7 +2519,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2464,9 +2545,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl-probe" @@ -2514,7 +2595,7 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2541,6 +2622,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] +name = "pem" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +dependencies = [ + "base64", + "serde", +] + +[[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2553,27 +2644,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.5", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2600,7 +2729,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ - "num-traits", + "num-traits 0.2.18", "plotters-backend", "plotters-svg", "wasm-bindgen", @@ -2648,9 +2777,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -2697,9 +2826,9 @@ dependencies = [ [[package]] name = "pqcrypto-kyber" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc5d857fb0a0a0695dbe379f449a185bf73d0173cdcaffa86c015b5d1b11490" +checksum = "15c00293cf898859d0c771455388054fd69ab712263c73fdc7f287a39b1ba000" dependencies = [ "cc", "glob", @@ -2748,7 +2877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2791,7 +2920,7 @@ dependencies = [ "bit-vec", "bitflags 2.4.2", "lazy_static", - "num-traits", + "num-traits 0.2.18", "rand", "rand_chacha", "rand_xorshift", @@ -2837,7 +2966,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.48", + "syn 2.0.52", "tempfile", "which", ] @@ -2852,7 +2981,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2866,9 +2995,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" +checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" dependencies = [ "once_cell", "protobuf-support", @@ -2877,9 +3006,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e85514a216b1c73111d9032e26cc7a5ecb1bb3d4d9539e91fb72a4395060f78" +checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77" dependencies = [ "anyhow", "once_cell", @@ -2892,9 +3021,9 @@ dependencies = [ [[package]] name = "protobuf-json-mapping" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523039a90666b229b5260fb91c20686ef309b9d1b1fc3cacb283a0895753ec44" +checksum = "5d8440284a60d89deae81f67cc713f03f770ae51461e7613e44808910502693e" dependencies = [ "protobuf", "protobuf-support", @@ -2903,9 +3032,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d6fbd6697c9e531873e81cec565a85e226b99a0f10e1acc079be057fe2fcba" +checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -2919,9 +3048,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" +checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" dependencies = [ "thiserror", ] @@ -2986,14 +3115,14 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12a5a2d6c7039059af621472a4389be1215a816df61aa4d531cfe85264aee95f" dependencies = [ - "num-traits", + "num-traits 0.2.18", ] [[package]] name = "rayon" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3010,6 +3139,19 @@ dependencies = [ ] [[package]] +name = "rcgen" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa96feb4d337a43eae1b39b6d4cafc2860a46cf9cec6f1e65294244ece65e348" +dependencies = [ + "pem", + "ring", + "rustls-pki-types", + "time", + "yasna", +] + +[[package]] name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3032,9 +3174,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3049,16 +3191,17 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3083,10 +3226,19 @@ dependencies = [ ] [[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.2", "errno", @@ -3129,6 +3281,12 @@ dependencies = [ ] [[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" @@ -3158,9 +3316,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3209,7 +3367,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3247,9 +3405,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "send_wrapper" @@ -3259,29 +3417,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3410,6 +3568,12 @@ dependencies = [ ] [[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3432,14 +3596,14 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "snow" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e87c18a6608909007e75a60e04d03eda77b601c94de1c74d9a9dc2c04ab789a" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ "aes-gcm", "blake2", @@ -3453,12 +3617,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3481,24 +3645,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3520,9 +3684,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -3537,18 +3701,17 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] @@ -3586,7 +3749,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3597,29 +3760,29 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "test-case-core", ] [[package]] name = "test-log" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b" +checksum = "7b319995299c65d522680decf80f2c108d85b861d81dfe340a10d16cee29d9e6" dependencies = [ - "env_logger", + "env_logger 0.11.3", "test-log-macros", ] [[package]] name = "test-log-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d" +checksum = "c8f546451eaa38373f549093fe9fd05e7d2bade739e2ddf834b9968621d60107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3633,22 +3796,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3708,10 +3871,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] +name = "tls-parser" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409206e2de64edbf7ea99a44ac31680daf9ef1a57895fb3c5bd738a903691be0" +dependencies = [ + "enum_primitive", + "nom", + "nom-derive", + "phf", + "phf_codegen", + "rusticata-macros", +] + +[[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -3744,7 +3921,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3818,7 +3995,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.5", "toml_datetime", "winnow", ] @@ -3849,7 +4026,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3876,7 +4053,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "rand", @@ -3895,7 +4072,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "rand", @@ -3940,18 +4117,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 = "universal-hash" @@ -4025,16 +4202,6 @@ dependencies = [ ] [[package]] -name = "variant_count" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4051,9 +4218,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4078,7 +4245,7 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "hyper 0.14.28", "log", "mime", @@ -4108,9 +4275,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4118,24 +4285,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4143,28 +4310,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4185,7 +4352,7 @@ dependencies = [ "log", "mediasan-common", "num-integer", - "num-traits", + "num-traits 0.2.18", "thiserror", ] @@ -4238,7 +4405,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4265,7 +4432,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]] @@ -4300,17 +4467,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]] @@ -4327,9 +4494,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" @@ -4345,9 +4512,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" @@ -4363,9 +4530,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" @@ -4381,9 +4548,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" @@ -4399,9 +4566,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" @@ -4417,9 +4584,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" @@ -4435,24 +4602,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.34" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[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", @@ -4461,6 +4628,15 @@ dependencies = [ ] [[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[package]] name = "zeroize" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4477,7 +4653,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -4517,13 +4693,16 @@ dependencies = [ "hkdf", "lazy_static", "libsignal-core", + "num_enum", "partial-default", "poksho", "rand", + "rayon", "serde", "sha2", "signal-crypto", "subtle", + "test-case", "uuid", "zkcredential", ] diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index ffee3ff05e7c2..06afbfc804080 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.41.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; rev = "v${version}"; - hash = "sha256-U/Wy7nzRQJLdc/dGmYR418Nt1KV70HbcgnDHmYxKytg="; + hash = "sha256-HqnxemAPjjKl/l4dVjEUIIvgW3ibNtQWnA10QYcd8Os="; }; nativeBuildInputs = [ protobuf ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix index e5bc293e873b3..2475a653c3ccc 100644 --- a/pkgs/by-name/lx/lxd-ui/package.nix +++ b/pkgs/by-name/lx/lxd-ui/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchYarnDeps, nodejs, - prefetch-yarn-deps, + fixup-yarn-lock, yarn, nixosTests, nix-update-script, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index 5a7b677802ee8..a98d22761e71e 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -1,5 +1,5 @@ src: version: -{ lib, fetchYarnDeps, nodejs_18, prefetch-yarn-deps, stdenv }: stdenv.mkDerivation { +{ lib, fetchYarnDeps, nodejs_18, fixup-yarn-lock, stdenv }: stdenv.mkDerivation { name = "mealie-frontend"; inherit version; src = "${src}/frontend"; @@ -10,7 +10,7 @@ src: version: }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs_18 nodejs_18.pkgs.yarn ]; diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index a299e69bc69e7..d00da6941cf82 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , chromium }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/no/node-hp-scan-to/package.nix b/pkgs/by-name/no/node-hp-scan-to/package.nix index b6a5eced5f467..93ea3b3a760a9 100644 --- a/pkgs/by-name/no/node-hp-scan-to/package.nix +++ b/pkgs/by-name/no/node-hp-scan-to/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix index d3b9aef7ee151..e17d9c7f0c361 100644 --- a/pkgs/by-name/no/nomnatong/package.nix +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nomnatong"; - version = "5.09"; + version = "5.10"; src = fetchFromGitHub { owner = "nomfoundation"; repo = "font"; rev = "v${finalAttrs.version}"; - hash = "sha256-WkDvneCWuAS0/D+WUhd1F6dqpIuSAMK598mSRbNf6/8="; + hash = "sha256-e7LT6lwm4jbqL+mtvfZsCC7F6KOVYD/lAGRPAgyyMxc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.hashes.json b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.hashes.json deleted file mode 100644 index e9ad1c327f4f9..0000000000000 --- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.hashes.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-B8XBpYycOYBjrhjlnyiz42YukIoOjGTd3NN3EY00NiQ=", - "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-Zfwh9q2GrL5Dwp+J/8Ddd2IXCaUXpQ7dE3CqgCMMyPs=", - "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-/O5b2DzM8g97NAdJgIC/RsQ7E5P7USKq7TXyDuUE3WQ=", - "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-vrjB8GlhzWAe6jG/Srpy8R431VivNtWbCa5Uh4ATnmU=", - "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-EbnZt8h4Lcl0yJoOKmXlF1nfcP5hZv7n4cEQ10yBkcg=" -} diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.json b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.json deleted file mode 100644 index c729634b9e1e7..0000000000000 --- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "kind": "webfonts#webfontList", - "items": [ - { - "family": "Noto Emoji", - "variants": [ - "300", - "regular", - "500", - "600", - "700" - ], - "subsets": [ - "emoji" - ], - "version": "v47", - "lastModified": "2023-09-27", - "files": { - "300": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", - "regular": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", - "500": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", - "600": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", - "700": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" - }, - "category": "sans-serif", - "kind": "webfonts#webfont", - "menu": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" - } - ] -} diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.py b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.py deleted file mode 100755 index 9f1eadd95bca5..0000000000000 --- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.py +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i "python3 -I" -p python3 - -from contextlib import contextmanager -from pathlib import Path -from typing import Iterable, Optional -from urllib import request - -import hashlib, json - - -def getMetadata(apiKey: str, family: str = "Noto Emoji"): - '''Fetch the Google Fonts metadata for a given family. - - An API key can be obtained by anyone with a Google account (🚮) from - `https://developers.google.com/fonts/docs/developer_api#APIKey` - ''' - from urllib.parse import urlencode - - with request.urlopen( - "https://www.googleapis.com/webfonts/v1/webfonts?" + - urlencode({ 'key': apiKey, 'family': family }) - ) as req: - return json.load(req) - -def getUrls(metadata) -> Iterable[str]: - '''Fetch all files' URLs from Google Fonts' metadata. - - The metadata must obey the API v1 schema, and can be obtained from: - https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=${FAMILY} - ''' - return ( url for i in metadata['items'] for _, url in i['files'].items() ) - - -def hashUrl(url: str, *, hash: str = 'sha256'): - '''Compute the hash of the data from HTTP GETing a given `url`. - - The `hash` must be an algorithm name `hashlib.new` accepts. - ''' - with request.urlopen(url) as req: - return hashlib.new(hash, req.read()) - - -def sriEncode(h) -> str: - '''Encode a hash in the SRI format. - - Takes a `hashlib` object, and produces a string that - nixpkgs' `fetchurl` accepts as `hash` parameter. - ''' - from base64 import b64encode - return f"{h.name}-{b64encode(h.digest()).decode()}" - -def validateSRI(sri: Optional[str]) -> Optional[str]: - '''Decode an SRI hash, return `None` if invalid. - - This is not a full SRI hash parser, hash options aren't supported. - ''' - from base64 import b64decode - - if sri is None: - return None - - try: - hashName, b64 = sri.split('-', 1) - - h = hashlib.new(hashName) - digest = b64decode(b64, validate=True) - assert len(digest) == h.digest_size - - except: - return None - else: - return sri - - -def hashUrls( - urls: Iterable[str], - knownHashes: dict[str, str] = {}, -) -> dict[str, str]: - '''Generate a `dict` mapping URLs to SRI-encoded hashes. - - The `knownHashes` optional parameter can be used to avoid - re-downloading files whose URL have not changed. - ''' - return { - url: validateSRI(knownHashes.get(url)) or sriEncode(hashUrl(url)) - for url in urls - } - - -@contextmanager -def atomicFileUpdate(target: Path): - '''Atomically replace the contents of a file. - - Yields an open file to write into; upon exiting the context, - the file is closed and (atomically) replaces the `target`. - - Guarantees that the `target` was either successfully overwritten - with new content and no exception was raised, or the temporary - file was cleaned up. - ''' - from tempfile import mkstemp - fd, _p = mkstemp( - dir = target.parent, - prefix = target.name, - ) - tmpPath = Path(_p) - - try: - with open(fd, 'w') as f: - yield f - - tmpPath.replace(target) - - except Exception: - tmpPath.unlink(missing_ok = True) - raise - - -if __name__ == "__main__": - from os import environ - from urllib.error import HTTPError - - environVar = 'GOOGLE_FONTS_TOKEN' - currentDir = Path(__file__).parent - metadataPath = currentDir / 'noto-emoji.json' - - try: - apiToken = environ[environVar] - metadata = getMetadata(apiToken) - - except (KeyError, HTTPError) as exn: - # No API key in the environment, or the query was rejected. - match exn: - case KeyError if exn.args[0] == environVar: - print(f"No '{environVar}' in the environment, " - "skipping metadata update") - - case HTTPError if exn.getcode() == 403: - print("Got HTTP 403 (Forbidden)") - if apiToken != '': - print("Your Google API key appears to be valid " - "but does not grant access to the fonts API.") - print("Aborting!") - raise SystemExit(1) - - case HTTPError if exn.getcode() == 400: - # Printing the supposed token should be fine, as this is - # what the API returns on invalid tokens. - print(f"Got HTTP 400 (Bad Request), is this really an API token: '{apiToken}' ?") - case _: - # Unknown error, let's bubble it up - raise - - # In that case just use the existing metadata - with metadataPath.open() as metadataFile: - metadata = json.load(metadataFile) - - lastModified = metadata["items"][0]["lastModified"]; - print(f"Using metadata from file, last modified {lastModified}") - - else: - # If metadata was successfully fetched, validate and persist it - lastModified = metadata["items"][0]["lastModified"]; - print(f"Fetched current metadata, last modified {lastModified}") - with atomicFileUpdate(metadataPath) as metadataFile: - json.dump(metadata, metadataFile, indent = 2) - metadataFile.write("\n") # Pacify nixpkgs' dumb editor config check - - hashPath = currentDir / 'noto-emoji.hashes.json' - try: - with hashPath.open() as hashFile: - hashes = json.load(hashFile) - except FileNotFoundError: - hashes = {} - - with atomicFileUpdate(hashPath) as hashFile: - json.dump( - hashUrls(getUrls(metadata), knownHashes = hashes), - hashFile, - indent = 2, - ) - hashFile.write("\n") # Pacify nixpkgs' dumb editor config check diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix index 08f78b613efc7..1cf7b6c5fcdb0 100644 --- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix @@ -1,46 +1,32 @@ { lib , stdenvNoCC -, fetchurl +, fetchFromGitHub +, rename }: -# Metadata fetched from -# https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=Noto+Emoji -let - metadata = with builtins; head (fromJSON (readFile ./noto-emoji.json)).items; - urlHashes = with builtins; fromJSON (readFile ./noto-emoji.hashes.json); -in stdenvNoCC.mkDerivation { pname = "noto-fonts-monochrome-emoji"; - version = "${lib.removePrefix "v" metadata.version}.${metadata.lastModified}"; - preferLocalBuild = true; - - dontUnpack = true; - srcs = - let - weightNames = { - "300" = "Light"; - regular = "Regular"; - "500" = "Medium"; - "600" = "SemiBold"; - "700" = "Bold"; - }; - in - lib.mapAttrsToList - (variant: url: fetchurl { - name = "NotoEmoji-${weightNames.${variant}}.ttf"; - hash = urlHashes.${url}; - inherit url; - }) - metadata.files; + version = "3.000"; + + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "a73b9ab0a5df191bcfed817159a903911ea7958a"; + hash = "sha256-qVFU4uZius8oFPJCIL9ek2YdS3jru5mmTHp2L9RIXfg="; + sparseCheckout = [ "ofl/notoemoji" ]; + }; installPhase = '' runHook preInstall - for src in $srcs; do - install -D $src $out/share/fonts/noto/$(stripHash $src) - done + + install -m444 -Dt $out/share/fonts/noto ofl/notoemoji/*.ttf + ${rename}/bin/rename 's/\[.*\]//' $out/share/fonts/noto/* + runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { description = "Monochrome emoji font"; homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji"; diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/update.sh b/pkgs/by-name/no/noto-fonts-monochrome-emoji/update.sh new file mode 100755 index 0000000000000..4141e68044f5b --- /dev/null +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts git nix-prefetch + +tmpdir=$(mktemp -d) + +git -C "$tmpdir" init --initial-branch main +git -C "$tmpdir" config core.sparseCheckout true +git -C "$tmpdir" remote add origin https://github.com/google/fonts.git +echo "ofl/notoemoji/*" > "$tmpdir/.git/info/sparse-checkout" +git -C "$tmpdir" fetch origin main +git -C "$tmpdir" checkout main + +newrev=$(git -C "$tmpdir" rev-list -1 HEAD "ofl/notoemoji/*.ttf") +newver=$(grep 'archive:' "$tmpdir/ofl/notoemoji/upstream.yaml" | grep -oP '(?<=v)[0-9]+\.[0-9]+') +newhash=$(nix-prefetch "{ stdenv, fetchurl }: stdenv.mkDerivation rec { + name = \"noto-fonts-cjk-serif\"; + src = fetchFromGitHub { + owner = \"google\"; + repo = \"fonts\"; + rev = \"$newrev\"; + sparseCheckout = [ \"ofl/notoemoji\" ]; + }; +}") + +update-source-version noto-fonts-monochrome-emoji "$newver" "$newhash" --rev="$newrev" diff --git a/pkgs/by-name/pr/prometheus-dnssec-exporter/package.nix b/pkgs/by-name/pr/prometheus-dnssec-exporter/package.nix new file mode 100644 index 0000000000000..3f366b789924f --- /dev/null +++ b/pkgs/by-name/pr/prometheus-dnssec-exporter/package.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub, }: +buildGoModule { + pname = "prometheus-dnssec-exporter"; + version = "0-unstable-2023-03-05"; + + src = fetchFromGitHub { + owner = "chrj"; + repo = "prometheus-dnssec-exporter"; + rev = "b638685ed8d5919a88b45e85b3aec702f0fcc393"; + hash = "sha256-SGoQKSgTRfSyA65xEZ9P7Z956sLMhB88h3HaXmFywiQ="; + }; + + vendorHash = "sha256-u7X8v7h1aL8B1el4jFzGRKHvnaK+Rz0OCitaC6xgyjw="; + + meta = with lib; { + homepage = "https://github.com/chrj/prometheus-dnssec-exporter"; + description = "DNSSEC Exporter for Prometheus"; + license = licenses.mit; + maintainers = with maintainers; [ swendel ]; + }; +} + diff --git a/pkgs/by-name/px/pxder/package.nix b/pkgs/by-name/px/pxder/package.nix index 96760f7f66921..8621621fe8502 100644 --- a/pkgs/by-name/px/pxder/package.nix +++ b/pkgs/by-name/px/pxder/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , makeWrapper -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , nodejs }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/se/sendme/Cargo.lock b/pkgs/by-name/se/sendme/Cargo.lock deleted file mode 100644 index 98ed742f519e2..0000000000000 --- a/pkgs/by-name/se/sendme/Cargo.lock +++ /dev/null @@ -1,4505 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "bytes", - "crypto-common", - "generic-array", -] - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "async-trait" -version = "0.1.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "attohttpc" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" -dependencies = [ - "http 0.2.11", - "log", - "url", - "wildmatch", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "getrandom", - "instant", - "rand", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bao-tree" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155e7e0c896695a9049badd7bf2b915d29230e24dc82a7c7ef065eded072404f" -dependencies = [ - "bytes", - "futures", - "iroh-blake3", - "iroh-io", - "positioned-io", - "range-collections", - "self_cell", - "smallvec", - "tokio", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "binary-merge" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bounded-integer" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a6932c88f1d2c29533a3b8a5f5a2f84cc19c3339b431677c3160c5c2e6ca85" - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -dependencies = [ - "serde", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.48.5", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", - "zeroize", -] - -[[package]] -name = "clap" -version = "4.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[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", - "quote", - "unicode-xid", -] - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[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.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crossbeam-utils" -version = "0.8.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "crypto_box" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16182b4f39a82ec8a6851155cc4c0cda3065bb1db33651726a29e1951de0f009" -dependencies = [ - "aead", - "chacha20", - "crypto_secretbox", - "curve25519-dalek", - "salsa20", - "serdect", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto_secretbox" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1" -dependencies = [ - "aead", - "chacha20", - "cipher", - "generic-array", - "poly1305", - "salsa20", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "platforms", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "data-encoding-macro" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" -dependencies = [ - "data-encoding", - "data-encoding-macro-internal", -] - -[[package]] -name = "data-encoding-macro-internal" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" -dependencies = [ - "data-encoding", - "syn 1.0.109", -] - -[[package]] -name = "default-net" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba429d84a27fa854c66fd2e29eb1cdf6d38bbfd4495bd9f522f12a7f21e05bf" -dependencies = [ - "dlopen2", - "libc", - "memalloc", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "once_cell", - "system-configuration", - "windows 0.48.0", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "der_derive", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "der_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "deranged" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derive_more" -version = "1.0.0-beta.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d" -dependencies = [ - "derive_more-impl", -] - -[[package]] -name = "derive_more-impl" -version = "1.0.0-beta.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", - "unicode-xid", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "dlopen2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" -dependencies = [ - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "duct" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" -dependencies = [ - "libc", - "once_cell", - "os_pipe", - "shared_child", -] - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "serde", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core", - "serde", - "sha2", - "subtle", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "erased-serde" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" -dependencies = [ - "serde", -] - -[[package]] -name = "erased_set" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a5aa24577083f8190ad401e376b55887c7cd9083ae95d83ceec5d28ea78125" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "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" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-executor" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-macro" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "genawaiter" -version = "0.99.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86bd0361bcbde39b13475e6e36cb24c329964aa2611be285289d1e4b751c1a0" -dependencies = [ - "futures-core", - "genawaiter-macro", - "genawaiter-proc-macro", - "proc-macro-hack", -] - -[[package]] -name = "genawaiter-macro" -version = "0.99.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b32dfe1fdfc0bbde1f22a5da25355514b5e450c33a6af6770884c8750aedfbc" - -[[package]] -name = "genawaiter-proc-macro" -version = "0.99.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784f84eebc366e15251c4a8c3acee82a6a6f427949776ecb88377362a9621738" -dependencies = [ - "proc-macro-error", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "governor" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot", - "quanta", - "rand", - "smallvec", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core", - "subtle", -] - -[[package]] -name = "h2" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.11", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "hmac-sha1" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1333fad8d94b82cab989da428b0b36a3435db3870d85e971a1d6dc0a8576722" -dependencies = [ - "sha1", -] - -[[package]] -name = "hmac-sha256" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735" - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "hostname-validator" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.11", - "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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" -dependencies = [ - "bytes", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 0.2.11", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.11", - "hyper 0.14.28", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "hyper 1.1.0", - "pin-project-lite", - "socket2", - "tokio", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.51.1", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "igd" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556b5a75cd4adb7c4ea21c64af1c48cefb2ce7d43dc4352c720a1fe47c21f355" -dependencies = [ - "attohttpc", - "bytes", - "futures", - "http 0.2.11", - "hyper 0.14.28", - "log", - "rand", - "tokio", - "url", - "xmltree", -] - -[[package]] -name = "indexmap" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "inplace-vec-builder" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307" -dependencies = [ - "smallvec", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2", - "widestring", - "windows-sys 0.48.0", - "winreg", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "iroh-base" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b42ef43639a86a49132998f066810b702798818993e34565dd4eea835f626e" -dependencies = [ - "anyhow", - "bao-tree", - "data-encoding", - "hex", - "multibase", - "postcard", - "serde", - "serde-error", - "thiserror", -] - -[[package]] -name = "iroh-blake3" -version = "1.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb52cd11b3de4407f29579ebcd10fd746b0bd8ab758a2afac69baf88e96bede" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - -[[package]] -name = "iroh-bytes" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38213865ec542f82fc4d8a9748b5cdae92da1707c134428e9f60b1cd46ccbe39" -dependencies = [ - "anyhow", - "bao-tree", - "bytes", - "chrono", - "data-encoding", - "derive_more", - "flume", - "futures", - "genawaiter", - "hex", - "iroh-base", - "iroh-io", - "num_cpus", - "once_cell", - "postcard", - "quinn", - "rand", - "range-collections", - "reflink-copy", - "self_cell", - "serde", - "serde-error", - "smallvec", - "thiserror", - "tokio", - "tokio-util", - "tracing", - "tracing-futures", -] - -[[package]] -name = "iroh-io" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ace4f69567bfeb726672bab901d3e81be0c01119d860b2a10b7efb1553b880" -dependencies = [ - "bytes", - "futures", - "pin-project", - "smallvec", - "tokio", -] - -[[package]] -name = "iroh-metrics" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a3271df85ec2a18a358d36723039eeacb464d8764531c8fd9f822dac39410d" -dependencies = [ - "anyhow", - "erased_set", - "http-body-util", - "hyper 1.1.0", - "hyper-util", - "once_cell", - "prometheus-client", - "reqwest", - "serde", - "struct_iterable", - "time", - "tokio", - "tracing", -] - -[[package]] -name = "iroh-net" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0477847a7fe225f71fbdff7b0baccea8fc9c9b33e7755f4b28e19f075bd64499" -dependencies = [ - "aead", - "anyhow", - "backoff", - "bytes", - "crypto_box", - "curve25519-dalek", - "data-encoding", - "default-net", - "der", - "derive_more", - "duct", - "ed25519-dalek", - "flume", - "futures", - "governor", - "hex", - "hostname", - "http 1.0.0", - "http-body-util", - "hyper 1.1.0", - "hyper-util", - "igd", - "iroh-base", - "iroh-metrics", - "libc", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "num_enum", - "once_cell", - "parking_lot", - "postcard", - "quinn", - "quinn-proto", - "quinn-udp", - "rand", - "rand_core", - "rcgen", - "reqwest", - "ring 0.17.7", - "rtnetlink", - "rustls", - "rustls-webpki", - "serde", - "serde_bytes", - "serdect", - "smallvec", - "socket2", - "ssh-key", - "strum", - "stun-rs", - "surge-ping", - "thiserror", - "time", - "tokio", - "tokio-rustls", - "tokio-rustls-acme", - "tokio-util", - "tracing", - "trust-dns-resolver", - "ttl_cache", - "url", - "watchable", - "webpki-roots", - "windows 0.51.1", - "wmi", - "x509-parser", - "zeroize", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "js-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "libc" -version = "0.2.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - -[[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 = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memalloc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "multibase" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" -dependencies = [ - "base-x", - "data-encoding", - "data-encoding-macro", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "netlink-packet-core" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" -dependencies = [ - "anyhow", - "byteorder", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-route" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "byteorder", - "libc", - "netlink-packet-core", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-utils" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" -dependencies = [ - "anyhow", - "byteorder", - "paste", - "thiserror", -] - -[[package]] -name = "netlink-proto" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842c6770fc4bb33dd902f41829c61ef872b8e38de1405aa0b938b27b8fba12c3" -dependencies = [ - "bytes", - "futures", - "log", - "netlink-packet-core", - "netlink-sys", - "thiserror", - "tokio", -] - -[[package]] -name = "netlink-sys" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" -dependencies = [ - "bytes", - "futures", - "libc", - "log", - "tokio", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "libc", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - -[[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 = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "os_pipe" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p521" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" -dependencies = [ - "base16ct", - "ecdsa", - "elliptic-curve", - "primeorder", - "rand_core", - "sha2", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64", - "serde", -] - -[[package]] -name = "pem" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" -dependencies = [ - "base64", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "pest_meta" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "platforms" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" - -[[package]] -name = "pnet_base" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" -dependencies = [ - "no-std-net", -] - -[[package]] -name = "pnet_macros" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", -] - -[[package]] -name = "pnet_macros_support" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" -dependencies = [ - "pnet_base", -] - -[[package]] -name = "pnet_packet" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" -dependencies = [ - "glob", - "pnet_base", - "pnet_macros", - "pnet_macros_support", -] - -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "positioned-io" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccabfeeb89c73adf4081f0dca7f8e28dbda90981a222ceea37f619e93ea6afe9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "postcard" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" -dependencies = [ - "cobs", - "const_format", - "embedded-io", - "postcard-derive", - "serde", -] - -[[package]] -name = "postcard-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4b01218787dd4420daf63875163a787a78294ad48a24e9f6fa8c6507759a79" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precis-core" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d73e9dd26361c32e7cd13d1032bb01c4e26a23287274e8a4e2f228cf2c9ff77b" -dependencies = [ - "precis-tools", - "ucd-parse", - "unicode-normalization", -] - -[[package]] -name = "precis-profiles" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688124d96df311c37d794fb574bb5f75cdc86d8c5e514d3816d770a3dd0e1568" -dependencies = [ - "lazy_static", - "precis-core", - "precis-tools", - "unicode-normalization", -] - -[[package]] -name = "precis-tools" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07ecadec70b0f560f09abf815ae0ee1a940d38d2354c938ba7229ac7c9f5f52" -dependencies = [ - "lazy_static", - "regex", - "ucd-parse", -] - -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" -dependencies = [ - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "syn-mid", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prometheus-client" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510c4f1c9d81d556458f94c98f857748130ea9737bbd6053da497503b26ea63c" -dependencies = [ - "dtoa", - "itoa", - "parking_lot", - "prometheus-client-derive-encode", -] - -[[package]] -name = "prometheus-client-derive-encode" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quinn" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" -dependencies = [ - "bytes", - "rand", - "ring 0.16.20", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" -dependencies = [ - "bytes", - "libc", - "socket2", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "quoted-string-parser" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc75379cdb451d001f1cb667a9f74e8b355e9df84cc5193513cbe62b96fc5e9" -dependencies = [ - "pest", - "pest_derive", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "range-collections" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537" -dependencies = [ - "binary-merge", - "inplace-vec-builder", - "ref-cast", - "smallvec", -] - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rcgen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" -dependencies = [ - "pem 3.0.3", - "ring 0.16.20", - "time", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "ref-cast" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53313ec9f12686aeeffb43462c3ac77aa25f590a5f630eb2cde0de59417b29c7" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2566c4bf6845f2c2e83b27043c3f5dfcd5ba8f2937d6c00dc009bfb51a079dc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "reflink-copy" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767be24c0da52e7448d495b8d162506a9aa125426651d547d545d6c2b4b65b62" -dependencies = [ - "cfg-if", - "rustix", - "windows 0.52.0", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-lite" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "sha2", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rtnetlink" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" -dependencies = [ - "futures", - "log", - "netlink-packet-core", - "netlink-packet-route", - "netlink-packet-utils", - "netlink-proto", - "netlink-sys", - "nix 0.26.4", - "thiserror", - "tokio", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "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 0.17.7", - "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 0.17.7", - "untrusted 0.9.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.16" -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", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] - -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "self_cell" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] -name = "sendme" -version = "0.2.3" -dependencies = [ - "anyhow", - "base32", - "clap", - "console", - "duct", - "flume", - "futures", - "hex", - "indicatif", - "iroh-bytes", - "iroh-io", - "iroh-net", - "nix 0.27.1", - "num_cpus", - "rand", - "serde_json", - "tempfile", - "tokio", - "tokio-util", - "tracing", - "tracing-subscriber", - "walkdir", -] - -[[package]] -name = "serde" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-error" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e988182713aeed6a619a88bca186f6d6407483485ffe44c869ee264f8eabd13f" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serdect" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" -dependencies = [ - "base16ct", - "serde", -] - -[[package]] -name = "sha1" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c" - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "ssh-cipher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f" -dependencies = [ - "cipher", - "ssh-encoding", -] - -[[package]] -name = "ssh-encoding" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15" -dependencies = [ - "base64ct", - "pem-rfc7468", - "sha2", -] - -[[package]] -name = "ssh-key" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51901eb883a5b442b506a1f8fa483d143f3bab513fe721e398ec56c77624feb" -dependencies = [ - "ed25519-dalek", - "p256", - "p384", - "p521", - "rand_core", - "rsa", - "sec1", - "sha2", - "signature", - "ssh-cipher", - "ssh-encoding", - "subtle", - "zeroize", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "struct_iterable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849a064c6470a650b72e41fa6c057879b68f804d113af92900f27574828e7712" -dependencies = [ - "struct_iterable_derive", - "struct_iterable_internal", -] - -[[package]] -name = "struct_iterable_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb939ce88a43ea4e9d012f2f6b4cc789deb2db9d47bad697952a85d6978662c" -dependencies = [ - "erased-serde", - "proc-macro2", - "quote", - "struct_iterable_internal", - "syn 2.0.42", -] - -[[package]] -name = "struct_iterable_internal" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9426b2a0c03e6cc2ea8dbc0168dbbf943f88755e409fb91bcb8f6a268305f4a" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.42", -] - -[[package]] -name = "stun-rs" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78517bf347f802eba0204cdecf5ff10fb7056c914a3b2d9f2011f231cb1438b5" -dependencies = [ - "bounded-integer", - "byteorder", - "crc", - "fallible-iterator", - "hmac-sha1", - "hmac-sha256", - "hostname-validator", - "lazy_static", - "md5", - "paste", - "precis-core", - "precis-profiles", - "quoted-string-parser", - "rand", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "surge-ping" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af341b2be485d647b5dc4cfb2da99efac35b5c95748a08fb7233480fedc5ead3" -dependencies = [ - "hex", - "parking_lot", - "pnet_packet", - "rand", - "socket2", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn-mid" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" -dependencies = [ - "deranged", - "itoa", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.35.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[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-rustls-acme" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb6f50b5523d014ba161512c37457acb16fd8218c883c7152e0a67ab763f2d4" -dependencies = [ - "async-trait", - "base64", - "chrono", - "futures", - "log", - "pem 2.0.1", - "rcgen", - "reqwest", - "ring 0.16.20", - "rustls", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-rustls", - "url", - "webpki-roots", - "x509-parser", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "futures-util", - "hashbrown", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "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" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttl_cache" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4189890526f0168710b6ee65ceaedf1460c48a14318ceec933cb26baa492096a" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-parse" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212c59636157b18c2f57eed2799e6606c52fc49c6a11685ffb0d08f06e55f428" -dependencies = [ - "regex-lite", -] - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.42", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - -[[package]] -name = "watchable" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff90d0baafb3c0abbeebec1a8a305b4211c356de1d953a0dd77aab006baa8a62" -dependencies = [ - "event-listener", - "futures-util", - "parking_lot", - "thiserror", -] - -[[package]] -name = "web-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "wildmatch" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-implement" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "windows-interface" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.5.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wmi" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced703d10188571ce53582c2932ce640ed3c413cff7ee6e2d961f9abdb6a63d1" -dependencies = [ - "chrono", - "futures", - "log", - "serde", - "thiserror", - "windows 0.48.0", -] - -[[package]] -name = "x509-parser" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" -dependencies = [ - "asn1-rs", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "xmltree" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" -dependencies = [ - "xml-rs", -] - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.42", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index edcad04fc54a1..21091bfec2114 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -7,21 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-UaAiHGeSqy4kHO9CZX3kYeECZDo45web6yMbBRVnlhQ="; + hash = "sha256-y34x4XLIWsxS5+R+6rAejz0z6TCTxoQYPosXmpt9234="; }; - # TODO: Remove lock file and use 'cargoHash' instead once `watchable` crate - # is upgraded past v1.1.1. - # See https://github.com/khonsulabs/watchable/issues/1 - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-q4U4w4STs+34gJNyIibitf6RMvH6P/kBDZlOcwFrOxw="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/sh/shepherd/package.nix b/pkgs/by-name/sh/shepherd/package.nix index 4cd45aaea0b38..3f7323e564821 100644 --- a/pkgs/by-name/sh/shepherd/package.nix +++ b/pkgs/by-name/sh/shepherd/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/ve/vercel-pkg/package.nix b/pkgs/by-name/ve/vercel-pkg/package.nix index d3313069e4d03..c27d6699ed71d 100644 --- a/pkgs/by-name/ve/vercel-pkg/package.nix +++ b/pkgs/by-name/ve/vercel-pkg/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index a0ab34cef33c3..0f9b8f8bcc2d2 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -2,12 +2,12 @@ , licenseAccepted ? false }: -{ cmdLineToolsVersion ? "11.0" +{ cmdLineToolsVersion ? "13.0" , toolsVersion ? "26.1.1" -, platformToolsVersion ? "34.0.5" +, platformToolsVersion ? "35.0.1" , buildToolsVersions ? [ "34.0.0" ] , includeEmulator ? false -, emulatorVersion ? "34.1.9" +, emulatorVersion ? "35.1.4" , platformVersions ? [] , includeSources ? false , includeSystemImages ? false @@ -15,7 +15,7 @@ , abiVersions ? [ "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "26.1.10909125" +, ndkVersion ? "26.3.11579264" , ndkVersions ? [ndkVersion] , useGoogleAPIs ? false , useGoogleTVAddOns ? false diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 273cc3d8a8a54..3d23c5071a5dc 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -9,9 +9,12 @@ deployAndroidPackage { libcxx libGL libpulseaudio + libtiff libuuid zlib + libbsd ncurses5 + libdrm stdenv.cc.cc pkgsi686Linux.glibc expat @@ -30,6 +33,9 @@ deployAndroidPackage { libXi libXrender libXtst + libICE + libSM + libxkbfile ]); patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib @@ -37,6 +43,12 @@ deployAndroidPackage { addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib # autoPatchelf is not detecting libuuid :( addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib + + # This library is linked against a version of libtiff that nixpkgs doesn't have + for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do + patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true + done + autoPatchelf $out # Wrap emulator so that it can load required libraries at runtime diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 70684bc1b3dd1..88c1f7049ec3d 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -25,14 +25,14 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - cmdLineToolsVersion = "11.0"; - platformTools = "34.0.5"; + cmdLineToolsVersion = "13.0"; + platformTools = "35.0.1"; buildTools = "34.0.0"; ndk = [ - "26.1.10909125" + "26.3.11579264" ]; cmake = "3.6.4111459"; - emulator = "34.1.9"; + emulator = "35.1.4"; }; platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ]; diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index a9e1aaca55087..0b104abe1f9a9 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -11,8 +11,8 @@ deployAndroidPackage rec { inherit package os; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - autoPatchelfIgnoreMissingDeps = true; - buildInputs = lib.optionals (os == "linux") [ pkgs.zlib ]; + autoPatchelfIgnoreMissingDeps = [ "*" ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ]; patchElfBnaries = '' # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index 915a0f88728b3..0cf9ea53ceb61 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -11,7 +11,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -64,7 +64,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -110,7 +110,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -161,7 +161,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -198,7 +198,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -249,7 +249,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -286,7 +286,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -339,7 +339,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -399,7 +399,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -459,7 +459,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -519,7 +519,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -579,7 +579,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -639,7 +639,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -699,7 +699,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -759,7 +759,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -819,7 +819,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -879,7 +879,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -939,7 +939,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -985,7 +985,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1031,7 +1031,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1077,7 +1077,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1123,7 +1123,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1169,7 +1169,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1215,7 +1215,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1262,7 +1262,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1291,16 +1291,16 @@ "url": "https://dl.google.com/android/repository/gvm-windows_v2_0_0.zip" } ], - "displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer: Deprecated)", - "last-available-day": 19666, + "displayName": "Android Emulator hypervisor driver (installer)", + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", - "revision": "1.8.0", + "revision": "2.2.0", "revision-details": { - "major:0": "1", + "major:0": "2", "micro:2": "0", - "minor:1": "8" + "minor:1": "2" }, "type-details": { "element-attributes": { @@ -1322,7 +1322,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1350,7 +1350,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -1378,7 +1378,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -1413,7 +1413,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -1441,7 +1441,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -1469,7 +1469,7 @@ } ], "displayName": "Google Play Instant Development SDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -1506,7 +1506,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -1534,7 +1534,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -1562,7 +1562,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -1591,7 +1591,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -1619,7 +1619,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -1647,7 +1647,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -1675,7 +1675,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0", @@ -1703,7 +1703,7 @@ } ], "displayName": "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4", @@ -1731,7 +1731,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-alpha8", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8", @@ -1759,7 +1759,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1", @@ -1787,7 +1787,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2", @@ -1815,7 +1815,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3", @@ -1843,7 +1843,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta4", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4", @@ -1871,7 +1871,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta5", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5", @@ -1899,7 +1899,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1", @@ -1927,7 +1927,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2", @@ -1962,7 +1962,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0", @@ -1997,7 +1997,7 @@ } }, "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4", @@ -2032,7 +2032,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-alpha8", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8", @@ -2067,7 +2067,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1", @@ -2102,7 +2102,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2", @@ -2137,7 +2137,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3", @@ -2172,7 +2172,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta4", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4", @@ -2207,7 +2207,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta5", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5", @@ -2242,7 +2242,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1", @@ -2277,7 +2277,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2", @@ -2316,7 +2316,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -2354,7 +2354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -2394,7 +2394,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -2435,7 +2435,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -2473,7 +2473,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -2515,7 +2515,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -2553,7 +2553,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -2593,7 +2593,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -2634,7 +2634,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -2679,7 +2679,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -2710,7 +2710,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -2748,7 +2748,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -2788,7 +2788,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -2829,7 +2829,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -2874,7 +2874,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -2905,7 +2905,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -2943,7 +2943,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -2986,7 +2986,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3027,7 +3027,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3072,7 +3072,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3110,7 +3110,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -3150,7 +3150,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -3191,7 +3191,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -3236,7 +3236,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -3274,7 +3274,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -3314,7 +3314,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -3355,7 +3355,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -3393,7 +3393,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -3423,7 +3423,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -3455,7 +3455,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -3493,7 +3493,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -3531,7 +3531,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -3569,7 +3569,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -3602,7 +3602,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -3643,7 +3643,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -3684,7 +3684,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -3725,7 +3725,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -3763,7 +3763,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -3795,7 +3795,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -3833,7 +3833,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -3871,7 +3871,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -3909,7 +3909,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -3942,7 +3942,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -3983,7 +3983,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -4024,7 +4024,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -4065,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -4103,7 +4103,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -4140,7 +4140,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -4172,7 +4172,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -4210,7 +4210,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -4248,7 +4248,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -4286,7 +4286,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -4319,7 +4319,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -4360,7 +4360,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -4401,7 +4401,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -4442,7 +4442,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -4487,7 +4487,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -4519,7 +4519,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -4557,7 +4557,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -4595,7 +4595,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -4633,7 +4633,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -4673,7 +4673,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -4714,7 +4714,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -4755,7 +4755,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -4798,7 +4798,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -4843,7 +4843,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -4882,7 +4882,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -4919,7 +4919,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -4951,7 +4951,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -4989,7 +4989,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -5027,7 +5027,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -5060,7 +5060,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -5101,7 +5101,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -5142,7 +5142,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -5183,7 +5183,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -5226,7 +5226,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -5286,7 +5286,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -5325,7 +5325,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -5369,7 +5369,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -5406,7 +5406,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -5443,7 +5443,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -5487,7 +5487,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -5543,7 +5543,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -5599,7 +5599,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -5657,7 +5657,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -5702,7 +5702,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -5746,7 +5746,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -5783,7 +5783,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -5820,7 +5820,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -5864,7 +5864,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -5920,7 +5920,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -5978,7 +5978,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -6023,7 +6023,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -6062,7 +6062,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -6106,7 +6106,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -6136,7 +6136,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -6166,7 +6166,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -6210,7 +6210,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -6266,7 +6266,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -6322,7 +6322,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -6370,7 +6370,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -6426,7 +6426,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -6482,7 +6482,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -6542,7 +6542,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -6574,7 +6574,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -6628,7 +6628,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -6682,7 +6682,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -6726,7 +6726,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -6772,7 +6772,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -6818,7 +6818,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -6872,7 +6872,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -6940,7 +6940,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -7008,7 +7008,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -7068,7 +7068,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -7107,7 +7107,7 @@ } }, "displayName": "Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", @@ -7144,7 +7144,7 @@ } }, "displayName": "Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", @@ -7176,7 +7176,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -7218,7 +7218,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -7262,7 +7262,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", @@ -7290,9 +7290,9 @@ "archives": [ { "os": "all", - "sha1": "a23869f790fd42dddc83c47be1d1827fbebb7869", - "size": 650472769, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r10.zip" + "sha1": "c1d3209b861461e9c37273710bc4140ce2ae6056", + "size": 1240622989, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r12.zip" } ], "dependencies": { @@ -7302,8 +7302,8 @@ }, "min-revision:0": { "major:0": "30", - "micro:2": "4", - "minor:1": "0" + "micro:2": "0", + "minor:1": "8" } }, "dependency:1": { @@ -7318,13 +7318,13 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19666, - "license": "android-sdk-license", + "last-available-day": 19823, + "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", "revision": "30-google_apis-x86", "revision-details": { - "major:0": "10" + "major:0": "12" }, "type-details": { "abi:3": "x86", @@ -7374,7 +7374,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", @@ -7428,7 +7428,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -7496,7 +7496,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -7564,7 +7564,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -7624,7 +7624,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -7676,7 +7676,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -7720,7 +7720,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -7762,7 +7762,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -7816,7 +7816,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -7872,7 +7872,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -7936,7 +7936,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -7992,7 +7992,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -8024,9 +8024,9 @@ "archives": [ { "os": "all", - "sha1": "39f3c0eedd82f18ed701d516c943656e99ee9d80", - "size": 643079259, - "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-32_r01.zip" + "sha1": "c57d92a4131590b2a3b62f2a728766aa6bbec57f", + "size": 643262633, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-32_r02.zip" } ], "dependencies": { @@ -8042,13 +8042,13 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-32-default-arm64-v8a", "path": "system-images/android-32/default/arm64-v8a", "revision": "32-default-arm64-v8a", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "abi:2": "arm64-v8a", @@ -8066,9 +8066,9 @@ "archives": [ { "os": "all", - "sha1": "5c66a5fd207bdf750bae908573fc50e40451ef96", - "size": 667377292, - "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-32_r01.zip" + "sha1": "238452e27d6854d153b6ed119fa783189598eac4", + "size": 667541890, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-32_r02.zip" } ], "dependencies": { @@ -8084,13 +8084,13 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-32-default-x86_64", "path": "system-images/android-32/default/x86_64", "revision": "32-default-x86_64", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "abi:2": "x86_64", @@ -8110,9 +8110,9 @@ "archives": [ { "os": "all", - "sha1": "9e97d7ecd5b6cb9d9141bcbaaec134820ac569e1", - "size": 1536995307, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-32_r06.zip" + "sha1": "7940d3d7357e35b6f720c2bba1159d185bdb2fd5", + "size": 1569899980, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-32_r08.zip" } ], "dependencies": { @@ -8138,13 +8138,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", "revision": "32-google_apis-arm64-v8a", "revision-details": { - "major:0": "7" + "major:0": "8" }, "type-details": { "abi:3": "arm64-v8a", @@ -8166,9 +8166,9 @@ "archives": [ { "os": "all", - "sha1": "4b7fb40deefc6e7b5721774ce8f46310c2b434ca", - "size": 1511072885, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-32_r07.zip" + "sha1": "1b52794699c6889a2fd155bf235b67a592eb8f1d", + "size": 1538792859, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-32_r08.zip" } ], "dependencies": { @@ -8194,13 +8194,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", "revision": "32-google_apis-x86_64", "revision-details": { - "major:0": "7" + "major:0": "8" }, "type-details": { "abi:3": "x86_64", @@ -8224,15 +8224,15 @@ "archives": [ { "os": "macosx", - "sha1": "a03c886495ad5a3c3929fb0fc122c8ded743eef0", - "size": 1393496124, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-darwin.zip" + "sha1": "0a2cda9c5ee861f924170f07f272652732372f73", + "size": 1528883651, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r04-darwin.zip" }, { "os": "linux", - "sha1": "a03c886495ad5a3c3929fb0fc122c8ded743eef0", - "size": 1393496124, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-linux.zip" + "sha1": "0a2cda9c5ee861f924170f07f272652732372f73", + "size": 1528883651, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r04-linux.zip" } ], "dependencies": { @@ -8258,13 +8258,13 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", "revision": "32-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "3" + "major:0": "4" }, "type-details": { "abi:3": "arm64-v8a", @@ -8286,21 +8286,21 @@ "archives": [ { "os": "windows", - "sha1": "734f2fde664518688a402ad8198b10cf093c5871", - "size": 1437465460, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-windows.zip" + "sha1": "33fd570f0c5f14fe82b6507eab87017715368df7", + "size": 1503885352, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r04-windows.zip" }, { "os": "macosx", - "sha1": "734f2fde664518688a402ad8198b10cf093c5871", - "size": 1437465460, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-darwin.zip" + "sha1": "33fd570f0c5f14fe82b6507eab87017715368df7", + "size": 1503885352, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r04-darwin.zip" }, { "os": "linux", - "sha1": "734f2fde664518688a402ad8198b10cf093c5871", - "size": 1437465460, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-linux.zip" + "sha1": "33fd570f0c5f14fe82b6507eab87017715368df7", + "size": 1503885352, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r04-linux.zip" } ], "dependencies": { @@ -8326,13 +8326,13 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", "revision": "32-google_apis_playstore-x86_64", "revision-details": { - "major:0": "3" + "major:0": "4" }, "type-details": { "abi:3": "x86_64", @@ -8386,7 +8386,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -8438,7 +8438,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -8477,13 +8477,13 @@ } }, "displayName": "Wear OS 4 ARM 64 v8a System Image", - "last-available-day": 19666, - "license": "android-sdk-license", + "last-available-day": 19823, + "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", "revision": "33-android-wear-arm64-v8a", "revision-details": { - "major:0": "3" + "major:0": "4" }, "type-details": { "abi:2": "arm64-v8a", @@ -8514,13 +8514,13 @@ } }, "displayName": "Wear OS 4 Intel x86_64 Atom System Image", - "last-available-day": 19666, - "license": "android-sdk-license", + "last-available-day": 19823, + "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", "revision": "33-android-wear-x86_64", "revision-details": { - "major:0": "3" + "major:0": "4" }, "type-details": { "abi:2": "x86_64", @@ -8558,7 +8558,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-33-default-arm64-v8a", "path": "system-images/android-33/default/arm64-v8a", @@ -8600,7 +8600,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-33-default-x86_64", "path": "system-images/android-33/default/x86_64", @@ -8654,7 +8654,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", @@ -8710,7 +8710,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", @@ -8774,7 +8774,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -8830,7 +8830,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -8890,7 +8890,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", @@ -8942,7 +8942,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", @@ -8968,9 +8968,9 @@ "archives": [ { "os": "all", - "sha1": "ab83da3f827ee72df97ebeedd296d16f616edb38", - "size": 705123892, - "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-34_r02.zip" + "sha1": "d9f2011131919abe952814e041f16f317242c3fa", + "size": 705115396, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-34_r04.zip" } ], "dependencies": { @@ -8986,13 +8986,13 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-34-default-arm64-v8a", "path": "system-images/android-34/default/arm64-v8a", "revision": "34-default-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "4" }, "type-details": { "abi:2": "arm64-v8a", @@ -9010,9 +9010,9 @@ "archives": [ { "os": "all", - "sha1": "f5fe4d75eb589f5f876232422aefbc30f18a8ee7", - "size": 720744990, - "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-34_r02.zip" + "sha1": "5f6a249f9bc3b1b4c459b13ce2eb646c9680bed1", + "size": 720747116, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-34_r04.zip" } ], "dependencies": { @@ -9028,13 +9028,13 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-34-default-x86_64", "path": "system-images/android-34/default/x86_64", "revision": "34-default-x86_64", "revision-details": { - "major:0": "2" + "major:0": "4" }, "type-details": { "abi:2": "x86_64", @@ -9054,9 +9054,9 @@ "archives": [ { "os": "all", - "sha1": "ed608d998425371504ab7cf94a9392274d11f958", - "size": 1588260488, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r10.zip" + "sha1": "0981c5416516d609b1df5f29d3781c99d9fe061c", + "size": 1588261149, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r12.zip" } ], "dependencies": { @@ -9082,13 +9082,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", "revision": "34-google_apis-arm64-v8a", "revision-details": { - "major:0": "10" + "major:0": "12" }, "type-details": { "abi:3": "arm64-v8a", @@ -9110,9 +9110,9 @@ "archives": [ { "os": "all", - "sha1": "0f71bae97a2957b2f0a90d6f860eeef3c3aad639", - "size": 1541568459, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r10.zip" + "sha1": "3392de02e09144d61e3a789c0f17ce447b70b191", + "size": 1541568922, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r12.zip" } ], "dependencies": { @@ -9138,13 +9138,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, - "license": "android-sdk-preview-license", + "last-available-day": 19823, + "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", "revision": "34-google_apis-x86_64", "revision-details": { - "major:0": "10" + "major:0": "12" }, "type-details": { "abi:3": "x86_64", @@ -9167,16 +9167,22 @@ "arm64-v8a": { "archives": [ { + "os": "all", + "sha1": "a4fec7b9035d6f182fad788a4c1e5fef0fa94cb1", + "size": 1549222105, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext8_r02.zip" + }, + { "os": "macosx", - "sha1": "4bc4fd4a2cba586c9e3e36325c1a74244802a04a", - "size": 1563791983, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r06-darwin.zip" + "sha1": "32424be6344de382eb00ebe339ed41648fe93aa2", + "size": 1563453679, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext10_r01-darwin.zip" }, { "os": "linux", - "sha1": "4bc4fd4a2cba586c9e3e36325c1a74244802a04a", - "size": 1563791983, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r06-linux.zip" + "sha1": "32424be6344de382eb00ebe339ed41648fe93aa2", + "size": 1563453679, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext10_r01-linux.zip" } ], "dependencies": { @@ -9202,15 +9208,16 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis_playstore-arm64-v8a", - "path": "system-images/android-34/google_apis_playstore/arm64-v8a", + "path": "system-images/android-34-ext10/google_apis_playstore/arm64-v8a", "revision": "34-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "10" + "major:0": "2" }, "type-details": { + "abi:2": "arm64-v8a", "abi:3": "arm64-v8a", "api-level:0": "34", "element-attributes": { @@ -9230,9 +9237,9 @@ "archives": [ { "os": "all", - "sha1": "4704341d617f13997d52b74da8c1641a2b796681", - "size": 1502940011, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-34_r06.zip" + "sha1": "50f22ddfccd1e6652e75601c08f4ffd8ef0fd41b", + "size": 1502676954, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-34-ext10_r01.zip" } ], "dependencies": { @@ -9258,15 +9265,16 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, - "license": "android-sdk-preview-license", + "last-available-day": 19823, + "license": "android-sdk-license", "name": "system-image-34-google_apis_playstore-x86_64", - "path": "system-images/android-34/google_apis_playstore/x86_64", + "path": "system-images/android-34-ext10/google_apis_playstore/x86_64", "revision": "34-google_apis_playstore-x86_64", "revision-details": { - "major:0": "10" + "major:0": "2" }, "type-details": { + "abi:2": "x86_64", "abi:3": "x86_64", "api-level:0": "34", "element-attributes": { @@ -9308,7 +9316,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-TiramisuPrivacySandbox-google_apis-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis/arm64-v8a", @@ -9355,7 +9363,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "system-image-TiramisuPrivacySandbox-google_apis-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis/x86_64", @@ -9420,7 +9428,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", @@ -9477,7 +9485,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", @@ -9730,15 +9738,15 @@ "archives": [ { "os": "macosx", - "sha1": "e6aabf922aa936365236aa1ad5525a453ea7351e", - "size": 1553125173, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r02-darwin.zip" + "sha1": "90ccfc150180d529bc96ddc7d4a32249303ebd7f", + "size": 1548724067, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r03-darwin.zip" }, { "os": "linux", - "sha1": "e6aabf922aa936365236aa1ad5525a453ea7351e", - "size": 1553125173, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r02-linux.zip" + "sha1": "90ccfc150180d529bc96ddc7d4a32249303ebd7f", + "size": 1548724067, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r03-linux.zip" } ], "dependencies": { @@ -9764,13 +9772,13 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-arm-dbt-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/arm64-v8a", "revision": "UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:4": "arm64-v8a", @@ -9793,9 +9801,9 @@ "archives": [ { "os": "all", - "sha1": "c43caa79b262f6baea715f7174e614fb6ebd0922", - "size": 1514888929, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-UpsideDownCakePrivacySandbox_r02.zip" + "sha1": "f9b885d496787374be0c8be23eb7b69594c751a5", + "size": 1510877347, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-UpsideDownCakePrivacySandbox_r03.zip" } ], "dependencies": { @@ -9821,13 +9829,13 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/x86_64", "revision": "UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:4": "x86_64", @@ -9847,6 +9855,136 @@ } } } + }, + "VanillaIceCream": { + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "d87d6bb8cc98e91bd76a3585fed3f3616ad3140b", + "size": 1852895338, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-VanillaIceCream_r03.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "last-available-day": 19823, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-VanillaIceCream-google_apis-arm64-v8a", + "path": "system-images/android-VanillaIceCream/google_apis/arm64-v8a", + "revision": "VanillaIceCream-google_apis-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "f64e861db5568cfb0e6392dd4b34d78e41c1be8c", + "size": 1648708425, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-VanillaIceCream_r03.zip" + } + ], + "displayName": "Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "system-image-VanillaIceCream-google_apis-x86_64", + "path": "system-images/android-VanillaIceCream/google_apis/x86_64", + "revision": "VanillaIceCream-google_apis-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + } + } + } + }, + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "d0b5b5d7a7df6df55aa41b49460936ecf72625d1", + "size": 1863404889, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-VanillaIceCream_r03.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "last-available-day": 19823, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-VanillaIceCream-google_apis_playstore-arm64-v8a", + "path": "system-images/android-VanillaIceCream/google_apis_playstore/arm64-v8a", + "revision": "VanillaIceCream-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "3bfcf04fc5476d65588fbfc51798a9bbc94b5e19", + "size": 1673530237, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-VanillaIceCream_r03.zip" + } + ], + "displayName": "Google Play Intel x86_64 Atom System Image", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "system-image-VanillaIceCream-google_apis_playstore-x86_64", + "path": "system-images/android-VanillaIceCream/google_apis_playstore/x86_64", + "revision": "VanillaIceCream-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + } + } + } + } } }, "licenses": { @@ -9906,7 +10044,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9952,7 +10090,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9998,7 +10136,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10044,7 +10182,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10090,7 +10228,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10136,7 +10274,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10182,7 +10320,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10228,7 +10366,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10274,7 +10412,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -10319,7 +10457,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -10364,7 +10502,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10410,7 +10548,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10456,7 +10594,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10502,7 +10640,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10548,7 +10686,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10594,7 +10732,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -10639,7 +10777,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10685,7 +10823,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -10730,7 +10868,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10776,7 +10914,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -10821,7 +10959,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -10866,7 +11004,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -10911,7 +11049,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -10956,7 +11094,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -11001,7 +11139,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -11046,7 +11184,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -11091,7 +11229,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -11136,7 +11274,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -11181,7 +11319,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -11226,7 +11364,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -11271,7 +11409,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -11316,7 +11454,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -11361,7 +11499,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -11406,7 +11544,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -11451,7 +11589,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -11496,7 +11634,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -11541,7 +11679,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -11586,7 +11724,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -11631,7 +11769,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -11676,7 +11814,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11723,7 +11861,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11770,7 +11908,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -11815,7 +11953,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -11860,7 +11998,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -11905,7 +12043,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -11950,7 +12088,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11997,7 +12135,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12044,7 +12182,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12091,7 +12229,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -12136,7 +12274,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -12181,7 +12319,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -12226,7 +12364,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -12271,7 +12409,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -12316,7 +12454,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -12361,7 +12499,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -12399,7 +12537,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -12437,7 +12575,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -12475,7 +12613,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -12514,7 +12652,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -12552,7 +12690,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -12590,7 +12728,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -12606,6 +12744,44 @@ } } }, + "33.0.3": { + "archives": [ + { + "os": "linux", + "sha1": "83d08ea1cdad9733cae08e33c84758835987a508", + "size": 56003317, + "url": "https://dl.google.com/android/repository/build-tools_r33.0.3-linux.zip" + }, + { + "os": "macosx", + "sha1": "daaeee4fb70ae54fe03bb64e414ea88a16e66ba8", + "size": 60015916, + "url": "https://dl.google.com/android/repository/build-tools_r33.0.3-macosx.zip" + }, + { + "os": "windows", + "sha1": "9d93a3b5ff0497fca16739160327ec7ef44b3eff", + "size": 55630525, + "url": "https://dl.google.com/android/repository/build-tools_r33.0.3-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 33.0.3", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/33.0.3", + "revision": "33.0.3", + "revision-details": { + "major:0": "33", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "34.0.0": { "archives": [ { @@ -12628,7 +12804,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -12666,7 +12842,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -12705,7 +12881,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -12744,7 +12920,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -12799,6 +12975,84 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.0.0-rc1": { + "archives": [ + { + "os": "linux", + "sha1": "340cf69a732e880a8544f8b32dac8d9c88730b4e", + "size": 62860992, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc1-linux.zip" + }, + { + "os": "macosx", + "sha1": "dcd4b6d358eccc05ef7dfdead1e029581bb5e60f", + "size": 78408675, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc1-macosx.zip" + }, + { + "os": "windows", + "sha1": "432068f39066d3c529be98e331e81c1f1d7c218c", + "size": 59996484, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 35-rc1", + "last-available-day": 19823, + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/35.0.0-rc1", + "revision": "35.0.0-rc1", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.0.0-rc2": { + "archives": [ + { + "os": "linux", + "sha1": "c36ffb3f3238590f23c263cdd8e8c18d9ef10dc0", + "size": 60633658, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc2_linux.zip" + }, + { + "os": "windows", + "sha1": "9b13029b6160e32cd6ca4f9c2e3c49fa4e86996b", + "size": 59875696, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc2_windows.zip" + }, + { + "os": "macosx", + "sha1": "01630418469f2b7d4772777db2b4b40d836add34", + "size": 78321548, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc2_macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 35-rc2", + "last-available-day": 19823, + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/35.0.0-rc2", + "revision": "35.0.0-rc2", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmake": { @@ -12824,7 +13078,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -12862,7 +13116,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -12900,7 +13154,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -12938,7 +13192,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -12978,7 +13232,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -13015,7 +13269,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -13090,7 +13344,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -13181,6 +13435,43 @@ } } }, + "12.0": { + "archives": [ + { + "os": "linux", + "sha1": "d313adb7aedccf6cf0cfca51ec180f0059f5f8f8", + "size": 153607504, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" + }, + { + "os": "macosx", + "sha1": "37fb7dd41005b3b4ca6ea48ac27074b6fc4e3236", + "size": 153607488, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-11076708_latest.zip" + }, + { + "os": "windows", + "sha1": "3d2917302740f476999a091bc5558837c7a863c5", + "size": 153583359, + "url": "https://dl.google.com/android/repository/commandlinetools-win-11076708_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/12.0", + "revision": "12.0", + "revision-details": { + "major:0": "12", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "12.0-rc15": { "archives": [ { @@ -13219,6 +13510,119 @@ } } }, + "13.0": { + "archives": [ + { + "os": "linux", + "sha1": "2e1a11866ce7146dee1456152ff64d6c8158b2c0", + "size": 157033049, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-11479570_latest.zip" + }, + { + "os": "macosx", + "sha1": "4fe82efec2b7c33f373988f86d353d733698a0a3", + "size": 136810605, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-11479570_latest.zip" + }, + { + "os": "windows", + "sha1": "938b82035c25633e822bd4e048033a6b7816d3a8", + "size": 136324801, + "url": "https://dl.google.com/android/repository/commandlinetools-win-11479570_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/13.0", + "revision": "13.0", + "revision-details": { + "major:0": "13", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "13.0-rc01": { + "archives": [ + { + "os": "linux", + "sha1": "8d8f5c9ccc8746afed262b39c419be3d4e856124", + "size": 157028144, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-11379558_latest.zip" + }, + { + "os": "macosx", + "sha1": "c7f71dd662115aa2d370508f190e2df6e83884cc", + "size": 157028128, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-11379558_latest.zip" + }, + { + "os": "windows", + "sha1": "87247876f2c9a7dcf8885e6feb1e5481adccd0e5", + "size": 157003999, + "url": "https://dl.google.com/android/repository/commandlinetools-win-11379558_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19823, + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/13.0-rc01", + "revision": "13.0-rc01", + "revision-details": { + "major:0": "13", + "minor:1": "0", + "preview:2": "01" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "14.0-rc01": { + "archives": [ + { + "os": "linux", + "sha1": "46a5d7efd0db68c737c9f7f3a79aa915363f8ced", + "size": 160503024, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-11391160_latest.zip" + }, + { + "os": "macosx", + "sha1": "2b9006f2755f97f27473a079f973252f012a8301", + "size": 160503004, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-11391160_latest.zip" + }, + { + "os": "windows", + "sha1": "1e7c4acead6a4aabd9b753ffd98e116d59f7547e", + "size": 160472813, + "url": "https://dl.google.com/android/repository/commandlinetools-win-11391160_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19823, + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/14.0-alpha01", + "revision": "14.0-rc01", + "revision-details": { + "major:0": "14", + "minor:1": "0", + "preview:2": "01" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "2.0": { "archives": [ { @@ -13241,7 +13645,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -13279,7 +13683,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -13316,7 +13720,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -13353,7 +13757,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -13390,7 +13794,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -13427,7 +13831,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -13464,7 +13868,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -13501,7 +13905,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -13538,7 +13942,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -14081,6 +14485,44 @@ } } }, + "34.1.19": { + "archives": [ + { + "os": "linux", + "sha1": "d6cc94109b081c5f6042dcb71a453144f7e62ce7", + "size": 249458354, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-11525734.zip" + }, + { + "os": "macosx", + "sha1": "cc0736b8af11d1e74e03ab13dfc214217d06626b", + "size": 324283427, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11525734.zip" + }, + { + "os": "windows", + "sha1": "089de1942b9cc5d96c60c92fdad286434c340124", + "size": 363522255, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-11525734.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19813, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "34.1.19", + "revision-details": { + "major:0": "34", + "micro:2": "19", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "34.1.9": { "archives": [ { @@ -14118,6 +14560,158 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "34.2.11": { + "archives": [ + { + "os": "linux", + "sha1": "b1d6652408c1e5015ce2f590270aee7b0b19fb07", + "size": 298395480, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-11592276.zip" + }, + { + "os": "macosx", + "sha1": "f363626bc90b00e2d7cf8ceef9dcb295d3f7f292", + "size": 394402351, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11592276.zip" + }, + { + "os": "windows", + "sha1": "797a55cb5139c96eb17faca0b816b940eb006468", + "size": 418099397, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-11592276.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "34.2.11", + "revision-details": { + "major:0": "34", + "micro:2": "11", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.1.2": { + "archives": [ + { + "os": "linux", + "sha1": "c066c3d65b5a7454e039516ecc6a73b0ab754c17", + "size": 298454913, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-11616444.zip" + }, + { + "os": "macosx", + "sha1": "bf5eaf896dbfdbb832fd38255bace1658e524534", + "size": 394769949, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11616444.zip" + }, + { + "os": "windows", + "sha1": "dd37d4ab4e4655aea04b1ecc66fe4e4187b382e9", + "size": 423453316, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-11616444.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19813, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "35.1.2", + "revision-details": { + "major:0": "35", + "micro:2": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.1.3": { + "archives": [ + { + "os": "linux", + "sha1": "1fa0fe4bc06558a6bdbf622de1df6659c86fa832", + "size": 298471131, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-11643238.zip" + }, + { + "os": "macosx", + "sha1": "8c082cc61fff70561e41df68de78081a86b24bc8", + "size": 394818583, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11643238.zip" + }, + { + "os": "windows", + "sha1": "5128479f4d3eaef70f5412b665f6a706bbf2d898", + "size": 423494132, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-11643238.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19823, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "35.1.3", + "revision-details": { + "major:0": "35", + "micro:2": "3", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.1.4": { + "archives": [ + { + "os": "linux", + "sha1": "28c76739fbca9f2c879eb51f960aeaffacfd2ecd", + "size": 349797729, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-11672324.zip" + }, + { + "os": "macosx", + "sha1": "27da156d86d02ca82f898ac8adb0bfd7147e3f08", + "size": 414289925, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11672324.zip" + }, + { + "os": "windows", + "sha1": "f8083528676b40f2592133cdb4eaf4809cdfa164", + "size": 463059783, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-11672324.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "35.1.4", + "revision-details": { + "major:0": "35", + "micro:2": "4", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -14143,7 +14737,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -14180,7 +14774,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -14226,7 +14820,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -14271,7 +14865,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -14316,7 +14910,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -14361,7 +14955,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -14407,7 +15001,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -14452,7 +15046,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -14499,7 +15093,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -14546,7 +15140,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -14591,7 +15185,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -14636,7 +15230,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -14682,7 +15276,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -14727,7 +15321,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -14773,7 +15367,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -14819,7 +15413,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -14864,7 +15458,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -14910,7 +15504,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -14955,7 +15549,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -15000,7 +15594,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -15045,7 +15639,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -15091,7 +15685,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -15136,7 +15730,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -15181,7 +15775,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -15227,7 +15821,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -15273,7 +15867,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -15319,7 +15913,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -15365,7 +15959,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -15411,7 +16005,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -15457,7 +16051,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -15502,7 +16096,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -15547,7 +16141,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -15592,7 +16186,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -15638,7 +16232,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -15684,7 +16278,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -15730,7 +16324,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -15775,7 +16369,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -15821,7 +16415,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -15867,7 +16461,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -15913,7 +16507,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -15959,7 +16553,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -16004,7 +16598,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -16049,7 +16643,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -16094,7 +16688,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -16133,7 +16727,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10636728", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10636728", @@ -16172,7 +16766,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10792818", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.0.10792818", @@ -16210,7 +16804,7 @@ } ], "displayName": "NDK (Side by side) 26.1.10909125", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.1.10909125", @@ -16225,6 +16819,82 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "26.2.11394342": { + "archives": [ + { + "os": "macosx", + "sha1": "ceb609baf514614015279b5eee7dffc859426952", + "size": 983592055, + "url": "https://dl.google.com/android/repository/android-ndk-r26c-darwin.zip" + }, + { + "os": "linux", + "sha1": "7faebe2ebd3590518f326c82992603170f07c96e", + "size": 668556021, + "url": "https://dl.google.com/android/repository/android-ndk-r26c-linux.zip" + }, + { + "os": "windows", + "sha1": "f8c8aa6135241954461b2e3629cada4722e13ee7", + "size": 660158794, + "url": "https://dl.google.com/android/repository/android-ndk-r26c-windows.zip" + } + ], + "displayName": "NDK (Side by side) 26.2.11394342", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/26.2.11394342", + "revision": "26.2.11394342", + "revision-details": { + "major:0": "26", + "micro:2": "11394342", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "26.3.11579264": { + "archives": [ + { + "os": "linux", + "sha1": "fcdad75a765a46a9cf6560353f480db251d14765", + "size": 668556491, + "url": "https://dl.google.com/android/repository/android-ndk-r26d-linux.zip" + }, + { + "os": "macosx", + "sha1": "cebe7af9bdadc67b8f919d549e9ab269831fd2c9", + "size": 990809031, + "url": "https://dl.google.com/android/repository/android-ndk-r26d-darwin.zip" + }, + { + "os": "windows", + "sha1": "c7ea35ffe916082876611da1a6d5618d15430c29", + "size": 665022840, + "url": "https://dl.google.com/android/repository/android-ndk-r26d-windows.zip" + } + ], + "displayName": "NDK (Side by side) 26.3.11579264", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/26.3.11579264", + "revision": "26.3.11579264", + "revision-details": { + "major:0": "26", + "micro:2": "11579264", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -16257,7 +16927,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16302,7 +16972,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16347,7 +17017,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16392,7 +17062,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -16438,7 +17108,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16483,7 +17153,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -16530,7 +17200,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -16577,7 +17247,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16622,7 +17292,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16667,7 +17337,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16713,7 +17383,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16758,7 +17428,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16804,7 +17474,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16850,7 +17520,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16895,7 +17565,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16941,7 +17611,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16986,7 +17656,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17031,7 +17701,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17076,7 +17746,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17122,7 +17792,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17167,7 +17837,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17212,7 +17882,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17258,7 +17928,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17304,7 +17974,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17350,7 +18020,7 @@ } }, "displayName": "NDK", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17546,6 +18216,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "959bf20c19ab1c82861ae4a7e7fdb293f4f1fe75", + "size": 7035310, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "a54ebb00559f3e4582d8e06fc04bab7ce0a2a6c2", + "size": 12476293, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.1-darwin.zip" + }, + { + "os": "windows", + "sha1": "bef587e13dda79457631574b5ee93c0c596b592f", + "size": 6551888, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.1-win.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "35.0.1", + "revision-details": { + "major:0": "35", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -17559,7 +18267,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -17591,7 +18299,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -17623,7 +18331,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -17655,7 +18363,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -17687,7 +18395,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -17719,7 +18427,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -17751,7 +18459,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -17783,7 +18491,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -17815,7 +18523,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -17847,7 +18555,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -17891,7 +18599,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -17924,7 +18632,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -17956,7 +18664,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -17988,7 +18696,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -18020,7 +18728,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -18052,7 +18760,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -18084,7 +18792,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -18116,7 +18824,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -18148,7 +18856,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -18180,7 +18888,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -18212,7 +18920,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -18256,7 +18964,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18289,7 +18997,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -18321,7 +19029,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -18353,7 +19061,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -18385,7 +19093,7 @@ } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -18416,10 +19124,11 @@ "url": "https://dl.google.com/android/repository/platform-34-ext7_r02.zip" } ], - "displayName": "Android SDK Platform 34-ext8", - "last-available-day": 19666, + "displayName": "Android SDK Platform 34-ext10", + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-34", "revision": "34", "revision-details": { @@ -18461,7 +19170,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18506,7 +19215,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18551,7 +19260,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18584,7 +19293,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -18616,7 +19325,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -18648,7 +19357,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -18680,7 +19389,7 @@ } ], "displayName": "Android SDK Platform TiramisuPrivacySandbox", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", @@ -18711,7 +19420,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18737,19 +19446,19 @@ "archives": [ { "os": "all", - "sha1": "5701983e5660f11930e2da0ee28cb53426fd4933", - "size": 63995218, - "url": "https://dl.google.com/android/repository/platform-UpsideDownCakePrivacySandbox_r02.zip" + "sha1": "693beff31fe890c670efe34498c761ebe425ac8f", + "size": 64049813, + "url": "https://dl.google.com/android/repository/platform-UpsideDownCakePrivacySandbox_r03.zip" } ], "displayName": "Android SDK Platform UpsideDownCakePrivacySandbox", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-UpsideDownCakePrivacySandbox", "revision": "UpsideDownCakePrivacySandbox", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "api-level:0": "34", @@ -18763,6 +19472,37 @@ } } } + }, + "VanillaIceCream": { + "archives": [ + { + "os": "all", + "sha1": "b95f5a8a2bb908f8d13b6f874ab622e194c5aa20", + "size": 64097940, + "url": "https://dl.google.com/android/repository/platform-VanillaIceCream_r02.zip" + } + ], + "displayName": "Android SDK Platform VanillaIceCream", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-VanillaIceCream", + "revision": "VanillaIceCream", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } } }, "skiaparser": { @@ -18806,25 +19546,25 @@ "archives": [ { "os": "linux", - "sha1": "7fea0f8b5abaaa73b35e7703e54b641d0e60bba1", - "size": 6728126, - "url": "https://dl.google.com/android/repository/skiaparser-9858946-linux-x64.zip" + "sha1": "36e2c30f7745f4c062129a0fd549d29ab991db41", + "size": 6767192, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-linux.zip" }, { "os": "macosx", - "sha1": "d08e3a0dab58ad944c837e331f5b2088a7b683eb", - "size": 7846286, - "url": "https://dl.google.com/android/repository/skiaparser-9858946-mac-x64.zip" + "sha1": "04a834a8ab3efd4612300da7cef7f43a6b257468", + "size": 7401688, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-mac.zip" }, { "os": "windows", - "sha1": "316c255048f2164a8a3e57692b5b232d2db0963f", - "size": 7336670, - "url": "https://dl.google.com/android/repository/skiaparser-9858946-win-x64.zip" + "sha1": "567f24512f9d9487a3b948032a136261f5d59c92", + "size": 6532776, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-win.zip" } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -18838,6 +19578,42 @@ } } }, + "4": { + "archives": [ + { + "os": "linux", + "sha1": "caafe27824ceb1c69691766984ab287354104b50", + "size": 6433967, + "url": "https://dl.google.com/android/repository/skiaparser-11591181-linux-x64.zip" + }, + { + "os": "macosx", + "sha1": "8043d8f669fec8a3785f95c3e22a7b753cc70c3d", + "size": 2933536, + "url": "https://dl.google.com/android/repository/skiaparser-11591181-darwin-x64.zip" + }, + { + "os": "windows", + "sha1": "b1b2ca27aa2f2783dda3a7d73bb4f039513a9500", + "size": 2920006, + "url": "https://dl.google.com/android/repository/skiaparser-11591181-win-x64.zip" + } + ], + "displayName": "Layout Inspector image server for API 31-35", + "last-available-day": 19823, + "license": "android-sdk-license", + "name": "skiaparser", + "path": "skiaparser/3", + "revision": "4", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "6": { "archives": [ { @@ -18860,7 +19636,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -18886,7 +19662,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -18914,7 +19690,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -18941,7 +19717,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -18968,7 +19744,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -18995,7 +19771,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -19022,7 +19798,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -19049,7 +19825,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -19076,7 +19852,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -19103,7 +19879,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -19130,7 +19906,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -19157,7 +19933,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -19184,7 +19960,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -19211,7 +19987,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -19238,7 +20014,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -19265,7 +20041,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -19292,7 +20068,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -19319,7 +20095,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -19346,7 +20122,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -19373,7 +20149,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -19400,7 +20176,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -19427,7 +20203,7 @@ } ], "displayName": "Sources for Android 34", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", @@ -19491,7 +20267,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 19666, + "last-available-day": 19823, "license": "android-sdk-license", "name": "tools", "obsolete": "true", diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 8b67a007b6b55..fc5eb933a98e2 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.10"; + version = "0.4.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-keZebaqIs+xaGy5O1551w05fV301XHzJpPDwvY4Tjnk="; + hash = "sha256-8AScYCDgv8Dkjt/0WJ4P2q2H9dykuq3w00qDDP8PiSs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index f9776a0cb6f1c..cbd44aa17016b 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.11"; + version = "0.8.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-VvpdeupBW8wZyNnAx9cvp0Li5z3D/AnqipTEGTsd2IE="; + hash = "sha256-X7MqBDmVfLy5ajqhFcvA8oCaoxy3zLusXkB659qWR5E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/automx2/default.nix b/pkgs/development/python-modules/automx2/default.nix index cfc3a8484b67d..a0b4f78e6754c 100644 --- a/pkgs/development/python-modules/automx2/default.nix +++ b/pkgs/development/python-modules/automx2/default.nix @@ -6,22 +6,27 @@ , ldap3 , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "automx2"; - version = "unstable-2023-08-23"; - format = "setuptools"; + version = "2024.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rseichter"; - repo = pname; - rev = "f3e3fc8e769c3799361001d51b7d9335a6a9d1a8"; - hash = "sha256-NkeazjjGDYUXfoydvEfww6e7SkSZ8rMRlML+oOaf374="; + repo = "automx2"; + rev = version; + hash = "sha256-s/kd9A/d3SPMZC9+B4DdcXVi77WLH/SBwXIdaKHUj34="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask flask-migrate diff --git a/pkgs/development/python-modules/base64io/default.nix b/pkgs/development/python-modules/base64io/default.nix index 32753a710fc87..0ca50fa63dc56 100644 --- a/pkgs/development/python-modules/base64io/default.nix +++ b/pkgs/development/python-modules/base64io/default.nix @@ -1,25 +1,38 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , mock , pytestCheckHook +, pythonOlder +, setuptools +, unstableGitUpdater }: buildPythonPackage rec { pname = "base64io"; - version = "1.0.3"; - format = "setuptools"; + version = "1.0.3-unstable-2023-10-30"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-JPLQ/nZcNTOeGy0zqpX5E3sbdltZQWT60QFsFYJ6cHM="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "base64io-python"; + rev = "604817576e607d1f7f8af1ffa1530522fd4e4be2"; + hash = "sha256-RFl0iuyHdPf3VpBxH4m/N2yaKEBxkNMT1ldZP9VGGOk="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ mock pytestCheckHook ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { homepage = "https://base64io-python.readthedocs.io/"; changelog = "https://github.com/aws/base64io-python/blob/${version}/CHANGELOG.rst"; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 6a9adcad54549..89601f3f482d5 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -6,7 +6,7 @@ , setuptools , nodejs , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , fetchYarnDeps , flask @@ -52,7 +52,7 @@ buildPythonPackage rec { setuptools nodejs yarn - prefetch-yarn-deps + fixup-yarn-lock ]; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index eafc2b49e74c4..0fb7c3327db45 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pytz , requests +, setuptools , six }: @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-JGqYpj5h9UoV0WEFyxVIjFZwc030HobHrw1dnAryQLk="; }; + patches = [ + ./pytest-warn-none.patch + ]; + nativeBuildInputs = [ flit-core pbr @@ -29,6 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz requests + setuptools six ]; @@ -41,7 +47,11 @@ buildPythonPackage rec { # don't run tests that try to spin up jenkins disabledTests = [ "systests" ]; - pythonImportsCheck = [ "jenkinsapi" ]; + pythonImportsCheck = [ + "jenkinsapi" + "jenkinsapi.utils" + "jenkinsapi.utils.jenkins_launcher" + ]; meta = with lib; { description = "A Python API for accessing resources on a Jenkins continuous-integration server"; diff --git a/pkgs/development/python-modules/jenkinsapi/pytest-warn-none.patch b/pkgs/development/python-modules/jenkinsapi/pytest-warn-none.patch new file mode 100644 index 0000000000000..7f9a732bbcb3f --- /dev/null +++ b/pkgs/development/python-modules/jenkinsapi/pytest-warn-none.patch @@ -0,0 +1,30 @@ +diff --git a/jenkinsapi_tests/unittests/test_build.py b/jenkinsapi_tests/unittests/test_build.py +index 2e2c2f4..9de816a 100644 +--- a/jenkinsapi_tests/unittests/test_build.py ++++ b/jenkinsapi_tests/unittests/test_build.py +@@ -3,6 +3,7 @@ import pytest + import pytz + from . import configs + import datetime ++import warnings + from jenkinsapi.build import Build + from jenkinsapi.job import Job + +@@ -252,7 +253,7 @@ def test_build_env_vars_wo_injected_env_vars_plugin(monkeypatch, build): + monkeypatch.setattr(Build, "get_data", fake_get_data) + + with pytest.raises(requests.HTTPError) as excinfo: +- with pytest.warns(None) as record: ++ with warnings.catch_warnings(record=True) as record: + build.get_env_vars() + assert "404" == str(excinfo.value) + assert len(record) == 1 +@@ -269,7 +270,7 @@ def test_build_env_vars_other_exception(monkeypatch, build): + monkeypatch.setattr(Build, "get_data", fake_get_data) + + with pytest.raises(Exception) as excinfo: +- with pytest.warns(None) as record: ++ with warnings.catch_warnings(record=True) as record: + build.get_env_vars() + assert "" == str(excinfo.value) + assert len(record) == 0 diff --git a/pkgs/development/python-modules/jsonslicer/default.nix b/pkgs/development/python-modules/jsonslicer/default.nix new file mode 100644 index 0000000000000..53f5ddb70523c --- /dev/null +++ b/pkgs/development/python-modules/jsonslicer/default.nix @@ -0,0 +1,32 @@ +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitHub, + pkg-config, + yajl, +}: + +buildPythonPackage rec { + pname = "jsonslicer"; + version = "0.1.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "AMDmi3"; + repo = "jsonslicer"; + rev = version; + hash = "sha256-uKIe/nJLCTe8WFIMB7+g3c0Yv3addgZEKYaBI6EpBSY="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ yajl ]; + + meta = with lib; { + description = "Stream JSON parser for Python "; + homepage = "https://github.com/AMDmi3/jsonslicer"; + license = licenses.mit; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 3c4c70bc40953..f1c24e88b7bb8 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.35.4"; + version = "1.35.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-5z2qyzDMfksxlj2KxAGw5TYn3aXbeUHZvwHiNjeWmLA="; + hash = "sha256-/gj3WTsxFxw2VPqYCQdnSi83RjjPHZ/I1nR163u3pb0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 3d73d3d194974..3f880f9d5f903 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.1.1"; + version = "16.1.2"; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-XCYNz1QQodUEidz1+A79yleqOnOCK3zJ8mBIPU5JEQg="; + hash = "sha256-nZvfkfO5u3iuN0g/KITWbhYCRAJngEOKCW48z6IEPMI="; }; patches = [ diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index e88d5e0fc6821..16d96297c544f 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , fetchurl -, prefetch-yarn-deps +, fixup-yarn-lock , git , lib , makeDesktopItem @@ -51,7 +51,7 @@ let pname = "${pname}-unwrapped"; inherit version src; - nativeBuildInputs = [ prefetch-yarn-deps git nodejs util-linux yarn zip ]; + nativeBuildInputs = [ fixup-yarn-lock git nodejs util-linux yarn zip ]; configurePhase = '' export HOME=$TMPDIR diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index a29de512404d1..19f0dd427023b 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -5,7 +5,7 @@ , python3 , fetchYarnDeps , fetchNpmDeps -, prefetch-yarn-deps +, fixup-yarn-lock , npmHooks , yarn , substituteAll @@ -29,7 +29,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { inherit (info) version; buildTargets = [ "electron:electron_dist_zip" ]; - nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn prefetch-yarn-deps unzip npmHooks.npmConfigHook ]; + nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn fixup-yarn-lock unzip npmHooks.npmConfigHook ]; buildInputs = base.buildInputs ++ [ libnotify ]; electronOfflineCache = fetchYarnDeps { diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index 8091c64b974be..a969baf411f80 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchurl , autoPatchelfHook , gcc-unwrapped , zlib @@ -17,22 +17,26 @@ let }.${system} or (throw "Unsupported system: ${system}"); packageHash = { - x86_64-linux = "sha256-Y0Inew0PncpnEpdLWtl/85t93eGSRewKh5mvGnn+yck="; - aarch64-linux = "sha256-HEm3TaLeaws8G73CU9BmxeplQdeF9nQbBSnbctaVhqI="; - x86_64-darwin = "sha256-mlshpN/4Od4qrXiqIEYo7G84Dtb+tp2nK2VnrRG2rto="; - aarch64-darwin = "sha256-aJH/vOidj0vbkttGDgelaAC/dMYguQPLjxl+V3pOVzI="; + x86_64-linux = "sha256-LHiLkZ+VN+wPnq6OukXozQWKh7ewNaFor1ndCUlCBtU="; + aarch64-linux = "sha256-1+rLGnm+LhbYigYUcmuLICLFXUk3wjOkmxuCuuI+Xqc="; + x86_64-darwin = "sha256-mJA3VXfNr6578Q2xw0xOZccloQpeCIsjn3dVdlsnTVs="; + aarch64-darwin = "sha256-FNl3UefJWA8yJ2B44GUEK6py7DLikJrygIwsqdIjW9c="; }.${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation rec { pname = "fermyon-spin"; - version = "2.2.0"; + version = "2.4.2"; - src = fetchzip { + # Use fetchurl rather than fetchzip as these tarballs are built by the project + # and not by GitHub (and thus are stable) - this simplifies the update script + # by allowing it to use the output of `nix store prefetch-file`. + src = fetchurl { url = "https://github.com/fermyon/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz"; - stripRoot = false; hash = packageHash; }; + sourceRoot = "."; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -46,7 +50,7 @@ in stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - cp $src/* $out/bin + cp ./spin $out/bin runHook postInstall ''; diff --git a/pkgs/development/tools/fermyon-spin/update.sh b/pkgs/development/tools/fermyon-spin/update.sh new file mode 100755 index 0000000000000..9d00621f1c372 --- /dev/null +++ b/pkgs/development/tools/fermyon-spin/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq +#shellcheck shell=bash + +CURRENT_HASH="" + +print_hash() { + OS="$1" + ARCH="$2" + VERSION="$3" + + URL="https://github.com/fermyon/spin/releases/download/v${VERSION}/spin-v${VERSION}-${OS}-${ARCH}.tar.gz" + echo + CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash') + + echo "${ARCH}-${OS}: $CURRENT_HASH" +} + +if [[ -z "$VER" && -n "$1" ]]; then + VER="$1" +fi + +if [[ -z "$VER" ]]; then + echo "No 'VER' environment variable provided, skipping" +else + print_hash "linux" "amd64" "$VER" + print_hash "linux" "aarch64" "$VER" + print_hash "macos" "amd64" "$VER" + print_hash "macos" "aarch64" "$VER" +fi + diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 77a66f6664fdd..6b2b720590e66 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-sGmNrkZv03yzEm9fM00H/BZnVr915LW3qGWjci1QACc="; + hash = "sha256-PS4YJpVut+KtEgSlTVtoVdlu6FVipPIzsl01/Io5N64="; }; - cargoHash = "sha256-6ZqbyM8MXN916HPG86PZAtAPFkXGvMD27Y5ql6o/tUQ="; + cargoHash = "sha256-kxzI/MlhboF0cWnyciK4vewWGXijPsOV0tPzfo1DHWc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index eca62c640bcf6..e57ee90f631de 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -12,7 +12,7 @@ , nixosTests , nodejs , nodejs-slim -, prefetch-yarn-deps +, fixup-yarn-lock , protobuf , python3 , qt6 @@ -103,7 +103,7 @@ let nativeBuildInputs = [ nodejs-slim - prefetch-yarn-deps + fixup-yarn-lock yarn ]; @@ -138,7 +138,7 @@ python3.pkgs.buildPythonApplication { nativeBuildInputs = [ fakeGit offlineYarn - prefetch-yarn-deps + fixup-yarn-lock cargo installShellFiles diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index cf85c5ddc5ee2..354eeba61aad2 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , python3 , makeWrapper @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ yarn - prefetch-yarn-deps + fixup-yarn-lock nodejs python3 makeWrapper diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 5c173b5e969a4..b0563a49d6b98 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -2,7 +2,7 @@ , stdenv , yarn , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , electron , fetchFromGitHub @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn - prefetch-yarn-deps + fixup-yarn-lock nodejs makeWrapper copyDesktopItems diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index dfa92cc8a3617..318d2617c838c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,12 +33,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.67"; - sha256_64bit = "sha256-mSAaCccc/w/QJh6w8Mva0oLrqB+cOSO1YMz1Se/32uI="; - sha256_aarch64 = "sha256-+UuK0UniAsndN15VDb/xopjkdlc6ZGk5LIm/GNs5ivA="; - openSha256 = "sha256-M/1qAQxTm61bznAtCoNQXICfThh3hLqfd0s1n1BFj2A="; - settingsSha256 = "sha256-FUEwXpeUMH1DYH77/t76wF1UslkcW721x9BHasaRUaM="; - persistencedSha256 = "sha256-ojHbmSAOYl3lOi2X6HOBlokTXhTCK6VNsH6+xfGQsyo="; + version = "550.76"; + sha256_64bit = "sha256-2/wAmBNiePhX74FsV7j21LnCaubxMC/kAYMmf8kQt1s="; + sha256_aarch64 = "sha256-LhiyYCUTFwqzUITK6CKIqxOQp62wG1RuKOuP0fTKoVk="; + openSha256 = "sha256-RWaUXIr/yCRmX4yIyUxvBxrKCLKRKSi4lQJAYvrd2Kg="; + settingsSha256 = "sha256-Lv95+0ahvU1+X/twzWWVqQH4nqq491ALigH9TVBn+YY="; + persistencedSha256 = "sha256-rbgI9kGdVzGlPNEvaoOq2zrAMx+H8D+XEBah2eqZzuI="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/servers/aeron/default.nix b/pkgs/servers/aeron/default.nix index 202f2748c4e80..84e7d44447882 100644 --- a/pkgs/servers/aeron/default.nix +++ b/pkgs/servers/aeron/default.nix @@ -8,7 +8,7 @@ let pname = "aeron"; - version = "1.42.1"; + version = "1.43.0"; groupId = "io.aeron"; aeronAll_1_40_0 = fetchMavenArtifact { @@ -18,41 +18,6 @@ let hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA=="; }; - aeronAgent_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-agent"; - hash = "sha512-3XZ6XxPwlNchMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg=="; - }; - - aeronArchive_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-archive"; - hash = "sha512-tmH+/020d1iNkGb8nvenDG9YU+H4PLuO2hSm2dULUIjSXX5AHLDkkrQ3uVQADV9koRNMtC4UXloqtqncay18kQ=="; - }; - - aeronClient_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-client"; - hash = "sha512-y3/8Lu2EgMICRNPEWe0hrKpVhF35pDjCO6ip/Af9nPZ70ZRqGmlfEG7OzWVok11DuI8pYJ64jv6bEtUfSHTYXQ=="; - }; - - aeronCluster_1_40_0 =fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-cluster"; - hash = "sha512-28m14Etjse3MVKBLvaQONujMfvdRQZG0ArezzVcjPEqVqTGd33mrqjPngALV8CG2nJTtcrJmsieRGLEosaXqTw=="; - }; - - aeronDriver_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-driver"; - hash = "sha512-SRWHMHR6J1YEtCbSHqSLYm3vo8XgkVXGK3cFQbONT60TZvawP5UlZs7e3eFNpu3qQSA4prqEjjWO9Xc9M/sjKw=="; - }; - aeronSamples_1_40_0 = fetchMavenArtifact { inherit groupId; version = "1.40.0"; @@ -63,57 +28,33 @@ let aeronAll_1_42_1 = fetchMavenArtifact { inherit groupId; artifactId = "aeron-all"; - inherit version; - hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; - }; - - aeronAgent_1_42_1 = fetchMavenArtifact { - inherit groupId; - version = "1.42.1"; - artifactId = "aeron-agent"; - hash = "sha512-3XZ6XvPwlNdiMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg=="; - }; - - aeronArchive_1_42_1 = fetchMavenArtifact { - inherit groupId; version = "1.42.1"; - artifactId = "aeron-archive"; - hash = "sha512-1DmeI9flgfzanbP4jSNUSAQAv2SGBvnlb3G4LbO1m+BN/gPn/nahvVHzotvGJjJA5b65DE1Sc5tqPnItRTK0zQ=="; + hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; }; - aeronClient_1_42_1 = fetchMavenArtifact { + aeronSamples_1_42_1 = fetchMavenArtifact { inherit groupId; version = "1.42.1"; - artifactId = "aeron-client"; - hash = "sha512-td2k2WNpaD3+2PNvlCCJ8cZRr615sFjngiQDKzuY2e9/de1OUwvER3zzVAFOonEIV+s5EhwVeQvWq3Wj5Uhadg=="; + artifactId = "aeron-samples"; + hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg=="; }; - aeronCluster_1_42_1 =fetchMavenArtifact { + aeronAll_1_43_0 = fetchMavenArtifact { inherit groupId; - version = "1.42.1"; - artifactId = "aeron-cluster"; - hash = "sha512-RiqGeY3pRqN6wWpeJqbeB1SCxrZWnQghrJlCGhew2M/GZAaWHkhhJs5haJqRvR5oOAbaI4RfIWvi5U7TiUo88g=="; + artifactId = "aeron-all"; + version = "1.43.0"; + hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q=="; }; - aeronDriver_1_42_1 = fetchMavenArtifact { - inherit groupId; - version = "1.42.1"; - artifactId = "aeron-driver"; - hash = "sha512-fKEN5oQCxD1h3qPODKkqFwYbKW6L03RFHNylpsYaNlztNODlCJd0CS5dBR6K8rbOdb2dVIXK/dW/IPBvOi5q/g=="; - }; - aeronSamples_1_42_1 = fetchMavenArtifact { + aeronSamples_1_43_0 = fetchMavenArtifact { inherit groupId; - version = "1.42.1"; + version = "1.43.0"; artifactId = "aeron-samples"; - hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg=="; + hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg=="; }; - aeronAll = aeronAll_1_42_1; - aeronArchive = aeronArchive_1_42_1; - aeronClient = aeronClient_1_42_1; - aeronCluster = aeronCluster_1_42_1; - aeronDriver= aeronDriver_1_42_1; - aeronSamples = aeronSamples_1_42_1; + aeronAll = aeronAll_1_43_0; + aeronSamples = aeronSamples_1_43_0; in stdenv.mkDerivation { @@ -121,10 +62,6 @@ in stdenv.mkDerivation { buildInputs = [ aeronAll - aeronArchive - aeronClient - aeronCluster - aeronDriver aeronSamples ]; @@ -141,10 +78,6 @@ in stdenv.mkDerivation { mkdir --parents "$out/share/java" ln --symbolic "${aeronAll.jar}" "$out/share/java/${pname}-all.jar" - ln --symbolic "${aeronArchive.jar}" "$out/share/java/${pname}-archive.jar" - ln --symbolic "${aeronClient.jar}" "$out/share/java/${pname}-client.jar" - ln --symbolic "${aeronCluster.jar}" "$out/share/java/${pname}-cluster.jar" - ln --symbolic "${aeronDriver.jar}" "$out/share/java/${pname}-driver.jar" ln --symbolic "${aeronSamples.jar}" "$out/share/java/${pname}-samples.jar" runHook postInstall diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 20ffd30547625..c670046f4264b 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, prefetch-yarn-deps, yarn, nodejs +, fixup-yarn-lock, yarn, nodejs , python3, pkg-config, libsass }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock yarn nodejs pkg-config diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 2e3dd149140d1..32255320b9173 100644 --- a/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, prefetch-yarn-deps, yarn, nodejs +, fixup-yarn-lock, yarn, nodejs , jpegoptim, oxipng, nodePackages }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock yarn nodejs jpegoptim diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 9160b3fe81a91..875b5b9b00317 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -6,7 +6,7 @@ , yarn , nodejs , nixosTests -, prefetch-yarn-deps +, fixup-yarn-lock }: buildGoModule rec { @@ -32,7 +32,7 @@ buildGoModule rec { hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY="; }; - nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ]; + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index ee5bfef3b9afc..f3c83a164bce6 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -13,17 +13,17 @@ buildGoModule rec { pname = "gonic"; - version = "0.15.2"; + version = "0.16.4"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lyKKD6Rxr4psFUxqGTtqQ3M/vQXoNPbcg0cTam9MkXk="; + sha256 = "sha256-+8rKODoADU2k1quKvbijjs/6S/hpkegHhG7Si0LSE0k="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ taglib zlib ]; - vendorHash = "sha256-+PUKPqW+ER7mmZXrDIc0cE4opoTxA3po3WXSeZO+Xwo="; + vendorHash = "sha256-6JkaiaAgtXYAZqVSRZJFObZvhEsHsbPaO9pwmKqIhYI="; # TODO(Profpatsch): write a test for transcoding support, # since it is prone to break @@ -39,6 +39,11 @@ buildGoModule rec { --replace \ '"mpv"' \ '"${lib.getBin mpv}/bin/mpv"' + '' + '' + substituteInPlace server/ctrlsubsonic/testdata/test* \ + --replace \ + '"audio/flac"' \ + '"audio/x-flac"' ''; passthru = { @@ -49,7 +54,7 @@ buildGoModule rec { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ autrimpo ]; platforms = lib.platforms.linux; mainProgram = "gonic"; }; diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index e22831cfbbdca..43bb86e458238 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -1,6 +1,6 @@ { stdenv , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs-slim , fetchFromGitHub , fetchYarnDeps @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-ejHzo6NHCMlNiYePWvfMY9Blb58pj3UQ5PFI0V84flI="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs-slim ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs-slim ]; postPatch = '' export HOME=$NIX_BUILD_TOP/fake_home diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index dcd2a6dcae35d..78c72187d81e8 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests , yarn, callPackage, ruby, writeShellScript -, fetchYarnDeps, prefetch-yarn-deps +, fetchYarnDeps, fixup-yarn-lock , brotli # Allow building a fork or custom version of Mastodon: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { hash = yarnHash; }; - nativeBuildInputs = [ prefetch-yarn-deps nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; + nativeBuildInputs = [ fixup-yarn-lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; RAILS_ENV = "production"; NODE_ENV = "production"; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 7507cb5fc8277..edc4a139c76ad 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -32,20 +32,20 @@ let in python.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.104.0"; + version = "1.105.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-/P7EBtXSYygUrqKQ4niI8J5zkBPZDgHCW/j2rFxRlsY="; + hash = "sha256-MydtP7jtTx9phmnoAajWvDI0sSqw+TScj+9n485L5qc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0lCbIlEM4wIG7W5BXWIZWkS6c/BkEG13xtcnPm3LjgY="; + hash = "sha256-yj3biat5znDqsen0mc8MNkXKhUftpb26VT7utWdpxvc="; }; postPatch = '' diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 09f1bc739863f..8811c816a0ac8 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , nodejs-slim , matrix-sdk-crypto-nodejs @@ -34,7 +34,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs-slim nodejs.pkgs.yarn nodejs.pkgs.node-gyp-build diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 26f5156e31ab4..7e9c27d38d22a 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mautrix-signal"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "v${version}"; - hash = "sha256-juem0enwwY5HOgci9Am2xcAsJK0F48DtpU7J/Osqd9k="; + hash = "sha256-T5w5k9fuAq5s6Y6pkGoDHSUHCf+kyURBLY0TtzgO85o="; }; buildInputs = [ @@ -18,7 +18,7 @@ buildGoModule rec { libsignal-ffi ]; - vendorHash = "sha256-CnuRzDiUVJt4PrU8u7UmT1ejrdpsohmDv8M0qfFb0Ac="; + vendorHash = "sha256-NuPctTEdj2BjCKqmzASYTlip7cimSff0OuhVIxlh1I8="; doCheck = false; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 76ac8bfd57126..f7108c69a5353 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-foYmHJk25SOCv+o6eiJTeD2VP8vi6PpeeDm845Lq43Y="; + hash = "sha256-GpeMzcWckh8q/Sh9YYV+qAdEvQ1XolhBw6+vgpACU20="; }; buildInputs = [ olm ]; - vendorHash = "sha256-2xHgGBVFzEnOFiZrg1ClgjUrzKVD3CLxPsvRO2iQBC4="; + vendorHash = "sha256-XhqrgRCW9HTPaTO9gMqDzEW22h53oprOYPAvMSGbcS4="; doCheck = false; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index bac1f19150032..745e5f5e25d51 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,11 +2,11 @@ , buildGoModule , fetchFromGitHub , fetchYarnDeps +, fixup-yarn-lock , grafana-agent , nix-update-script , nixosTests , nodejs -, prefetch-yarn-deps , stdenv , systemd , testers @@ -44,7 +44,7 @@ buildGoModule rec { "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" ]; - nativeBuildInputs = [ prefetch-yarn-deps nodejs yarn ]; + nativeBuildInputs = [ fixup-yarn-lock nodejs yarn ]; tags = [ "builtinassets" diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 12c9cb2e5ab24..524734819109e 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,7 +6,7 @@ , fetchYarnDeps , nixosTests , brotli -, prefetch-yarn-deps +, fixup-yarn-lock , jq , nodejs , which @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "cli" "runner" ]; - nativeBuildInputs = [ brotli prefetch-yarn-deps jq which yarn ]; + nativeBuildInputs = [ brotli fixup-yarn-lock jq which yarn ]; buildInputs = [ nodejs ]; diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix index ceadafc805033..98c4822a90b3a 100644 --- a/pkgs/servers/rmfakecloud/webui.nix +++ b/pkgs/servers/rmfakecloud/webui.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, lib, fetchYarnDeps, prefetch-yarn-deps, yarn, nodejs }: +{ version, src, stdenv, lib, fetchYarnDeps, fixup-yarn-lock, yarn, nodejs }: stdenv.mkDerivation rec { inherit version src; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JLCrpzytMKejmW+WlM6yybsoIZiimiJdPG5dSIn1L14="; }; - nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; + nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; buildPhase = '' export HOME=$(mktemp -d) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 80a05f979175f..e47845ea56c6f 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -19,7 +19,7 @@ , yarn , wasm-bindgen-cli , wasm-pack -, prefetch-yarn-deps +, fixup-yarn-lock , nixosTests , withRdpClient ? true @@ -80,7 +80,7 @@ let "-C linker=lld" ]; - nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ] ++ + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ] ++ lib.optional (lib.versionAtLeast version "15") [ binaryen cargo diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index b72925c0ab2e3..57c252054eb94 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -35,7 +35,7 @@ , icu , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodePackages , nodejs_18 , jq @@ -215,7 +215,7 @@ let nodejs_18 jq moreutils - prefetch-yarn-deps + fixup-yarn-lock ]; outputs = [ "out" "javascripts" ]; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 639a9a780c626..9cf085f8c2b04 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { }; passthru.tests = { - inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth; + inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth freshrss-none-auth; }; buildInputs = [ php ]; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 6464035db3174..a6b069f1dad89 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , makeWrapper -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , yarn , nixosTests @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-jK1jZ9NyBl3Dioh/7gXWx6XyyI6xJKt2a/XXzbhllZM="; }; - nativeBuildInputs = [ makeWrapper prefetch-yarn-deps ]; + nativeBuildInputs = [ makeWrapper fixup-yarn-lock ]; buildInputs = [ yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 35f633145a4d5..95b8963afb7c6 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -7,7 +7,7 @@ , postgresqlTestHook , postgresql , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , stdenv , server-mode ? true @@ -151,7 +151,7 @@ pythonPackages.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn prefetch-yarn-deps nodejs ]; + nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn fixup-yarn-lock nodejs ]; buildInputs = [ zlib pythonPackages.wheel diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index 65f32add0f6bf..96b1b94563af5 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -6,7 +6,7 @@ , protobuf , rustPlatform , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , stdenv , yarn , nodejs @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE="; }; - nativeBuildInputs = [ yarn nodejs prefetch-yarn-deps ]; + nativeBuildInputs = [ yarn nodejs fixup-yarn-lock ]; outputs = [ "out" "dist" ]; diff --git a/pkgs/tools/typesetting/marp/default.nix b/pkgs/tools/typesetting/marp/default.nix index 574159a76fa10..b61cc4dcdf661 100644 --- a/pkgs/tools/typesetting/marp/default.nix +++ b/pkgs/tools/typesetting/marp/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c01c4287ea514..376c42a51d75f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1022,6 +1022,7 @@ with pkgs; fetchpijul = callPackage ../build-support/fetchpijul { }; inherit (callPackages ../build-support/node/fetch-yarn-deps { }) + fixup-yarn-lock prefetch-yarn-deps fetchYarnDeps; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64078e5c7096b..f70995470ccd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6140,6 +6140,8 @@ self: super: with self; { jsonschema-specifications = callPackage ../development/python-modules/jsonschema-specifications { }; + jsonslicer = callPackage ../development/python-modules/jsonslicer { }; + jsonstreams = callPackage ../development/python-modules/jsonstreams { }; json-tricks = callPackage ../development/python-modules/json-tricks { }; |