diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index ff00548e049a..13b1835ee505 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -732,7 +732,7 @@ writeShellApplication { ## `symlinkJoin` {#trivial-builder-symlinkJoin} -This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. +This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` (or alternatively `pname` and `version`) is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. Here is an example: ```nix # adds symlinks of hello and stack to current build and prints "links added" diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7c52cd1cb063..4be82af33884 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15375,12 +15375,6 @@ github = "niklaskorz"; githubId = 590517; }; - NikolaMandic = { - email = "nikola@mandic.email"; - github = "NikolaMandic"; - githubId = 4368690; - name = "Ratko Mladic"; - }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; @@ -19610,10 +19604,11 @@ }; shadowrz = { email = "shadowrz+nixpkgs@disroot.org"; - matrix = "@ShadowRZ:matrixim.cc"; + matrix = "@shadowrz:nixos.dev"; github = "ShadowRZ"; githubId = 23130178; name = "夜坂雅"; + keys = [ { fingerprint = "3237 D49E 8F81 5A45 2133 64EA 4FF3 5790 F405 53A9"; } ]; }; shahrukh330 = { email = "shahrukh330@gmail.com"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index d0c1e1af6f29..747765727379 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -190,6 +190,8 @@ - [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret). +- [tiny-dfr](https://github.com/WhatAmISupposedToPutHere/tiny-dfr), a dynamic function row daemon for the Touch Bar found on some Apple laptops. Available as [hardware.apple.touchBar.enable](options.html#opt-hardware.apple.touchBar.enable). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details. @@ -759,6 +761,8 @@ - `services.localtimed.enable = true` will now set `time.timeZone = null`. This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part. +- `qgis` and `qgis-ltr` are now built without `grass` by default. `grass` support can be enabled with `qgis.override { withGrass = true; }`. + ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/nixos/modules/hardware/apple-touchbar.nix b/nixos/modules/hardware/apple-touchbar.nix new file mode 100644 index 000000000000..700ef173a907 --- /dev/null +++ b/nixos/modules/hardware/apple-touchbar.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.hardware.apple.touchBar; + format = pkgs.formats.toml { }; + cfgFile = format.generate "config.toml" cfg.settings; +in +{ + options.hardware.apple.touchBar = { + enable = lib.mkEnableOption "support for the Touch Bar on some Apple laptops using tiny-dfr"; + package = lib.mkPackageOption pkgs "tiny-dfr" { }; + + settings = lib.mkOption { + type = format.type; + default = { }; + description = '' + Configuration for tiny-dfr. See [example configuration][1] for available options. + + [1]: https://github.com/WhatAmISupposedToPutHere/tiny-dfr/blob/master/share/tiny-dfr/config.toml + ''; + example = lib.literalExpression '' + { + MediaLayerDefault = true; + ShowButtonOutlines = false; + EnablePixelShift = true; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + + environment.etc."tiny-dfr/config.toml".source = cfgFile; + systemd.services.tiny-dfr.restartTriggers = [ cfgFile ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e84580f8f0f1..53a8648b900b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -48,6 +48,7 @@ ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix + ./hardware/apple-touchbar.nix ./hardware/bladeRF.nix ./hardware/brillo.nix ./hardware/ckb-next.nix diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 300e4e72a01e..b4cad5ee23c1 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -4,7 +4,7 @@ let cfg = config.services.buildbot-master; opt = options.services.buildbot-master; - package = pkgs.python3.pkgs.toPythonModule cfg.package; + package = cfg.package.python.pkgs.toPythonModule cfg.package; python = package.pythonModule; escapeStr = lib.escape [ "'" ]; diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index a9a4f386e060..3e89c01dc841 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -36,7 +36,9 @@ let } // cfg.extraSettings; serverSettingsString = builtins.toJSON (lib.filterAttrsRecursive (n: v: v != null) serverSettings); serverSettingsFile = pkgs.writeText "server-settings.json" serverSettingsString; - serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins); + playerListOption = name: list: + lib.optionalString (list != []) + "--${name}=${pkgs.writeText "${name}.json" (builtins.toJSON list)}"; modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods cfg.mods-dat; in { @@ -59,6 +61,30 @@ in ''; }; + allowedPlayers = lib.mkOption { + # I would personally prefer for `allowedPlayers = []` to mean "no-one + # can connect" but Factorio seems to ignore empty whitelists (even with + # --use-server-whitelist) so we can't implement that behaviour, so we + # might as well match theirs. + type = lib.types.listOf lib.types.str; + default = []; + example = [ "Rseding91" "Oxyd" ]; + description = '' + If non-empty, only these player names are allowed to connect. The game + will not be able to save any changes made in-game with the /whitelist + console command, though they will still take effect until the server + is restarted. + + If empty, the whitelist defaults to open, but can be managed with the + in-game /whitelist console command (see: /help whitelist), which will + cause changes to be saved to the game's state directory (see also: + `stateDirName`). + ''; + }; + # Opting not to include the banlist in addition the the whitelist because: + # - banlists are not as often known in advance, + # - losing banlist changes on restart seems much more of a headache. + admins = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; @@ -177,7 +203,7 @@ in extraSettings = lib.mkOption { type = lib.types.attrs; default = {}; - example = { admins = [ "username" ];}; + example = { max_players = 64; }; description = '' Extra game configuration that will go into server-settings.json ''; @@ -298,7 +324,9 @@ in }" (lib.optionalString cfg.loadLatestSave "--start-server-load-latest") (lib.optionalString (cfg.mods != []) "--mod-directory=${modDir}") - (lib.optionalString (cfg.admins != []) "--server-adminlist=${serverAdminsFile}") + (playerListOption "server-adminlist" cfg.admins) + (playerListOption "server-whitelist" cfg.allowedPlayers) + (lib.optionalString (cfg.allowedPlayers != []) "--use-server-whitelist") ]; # Sandboxing diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 9caca5d74079..69b25d6ae648 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -26,7 +26,7 @@ in How often or when garbage collection is performed. For most desktop and server systems a sufficient garbage collection is once a week. - The format is described in + This value must be a calendar event in the format specified by {manpage}`systemd.time(7)`. ''; }; diff --git a/nixos/modules/services/monitoring/nezha-agent.nix b/nixos/modules/services/monitoring/nezha-agent.nix index 7ebbc7f2f329..6b8d0f58177e 100644 --- a/nixos/modules/services/monitoring/nezha-agent.nix +++ b/nixos/modules/services/monitoring/nezha-agent.nix @@ -31,6 +31,20 @@ in Enable GPU monitoring. ''; }; + temperature = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable temperature monitoring. + ''; + }; + useIPv6CountryCode = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use ipv6 countrycode to report location. + ''; + }; disableCommandExecute = lib.mkOption { type = lib.types.bool; default = true; @@ -96,7 +110,7 @@ in startLimitBurst = 3; script = lib.concatStringsSep " " ( [ - "${cfg.package}/bin/agent" + "${lib.getExe cfg.package}" "--disable-auto-update" "--disable-force-update" "--password $(cat ${cfg.passwordFile})" @@ -109,6 +123,8 @@ in ++ lib.optional cfg.skipProcess "--skip-procs" ++ lib.optional cfg.tls "--tls" ++ lib.optional cfg.gpu "--gpu" + ++ lib.optional cfg.temperature "--temperature" + ++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode" ); wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 29a30e938e75..cf840a2d4514 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -50,6 +50,7 @@ let "junos-czerwonk" "kea" "keylight" + "klipper" "knot" "lnd" "mail" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix b/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix new file mode 100644 index 000000000000..2d38a5023a0f --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.klipper; + inherit (lib) + mkOption + mkMerge + mkIf + types + concatStringsSep + any + optionalString + ; + moonraker = config.services.moonraker; +in +{ + port = 9101; + extraOpts = { + package = lib.mkPackageOption pkgs "prometheus-klipper-exporter" { }; + + moonrakerApiKey = mkOption { + type = types.str; + default = ""; + description = '' + API Key to authenticate with the Moonraker APIs. + Only needed if the host running the exporter is not a trusted client to Moonraker. + ''; + }; + }; + serviceOpts = mkMerge ( + [ + { + serviceConfig = { + ExecStart = concatStringsSep " " [ + "${cfg.package}/bin/prometheus-klipper-exporter" + (optionalString (cfg.moonrakerApiKey != "") "--moonraker.apikey ${cfg.moonrakerApiKey}") + "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" + "${concatStringsSep " " cfg.extraFlags}" + ]; + }; + } + ] + ++ [ + (mkIf config.services.moonraker.enable { + after = [ "moonraker.service" ]; + requires = [ "moonraker.service" ]; + }) + ] + ); +} diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 7973adccb796..4222b52515e5 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -282,6 +282,7 @@ in ExecStart = lib.getExe cfg.package; EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile; StateDirectory = "immich"; + SyslogIdentifier = "immich"; RuntimeDirectory = "immich"; User = cfg.user; Group = cfg.group; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fb85df8808f1..0821a2e15ced 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -699,8 +699,8 @@ in { nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {}; - nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {}; - nixos-rebuild-target-host = handleTest ./nixos-rebuild-target-host.nix {}; + nixos-rebuild-specialisations = runTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix; + nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {}; node-red = handleTest ./node-red.nix {}; diff --git a/nixos/tests/nixos-rebuild-specialisations.nix b/nixos/tests/nixos-rebuild-specialisations.nix index ab67bbaba676..f12d0fc48ce9 100644 --- a/nixos/tests/nixos-rebuild-specialisations.nix +++ b/nixos/tests/nixos-rebuild-specialisations.nix @@ -1,6 +1,10 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ hostPkgs, ... }: { name = "nixos-rebuild-specialisations"; + # TODO: remove overlay from nixos/modules/profiles/installation-device.nix + # make it a _small package instead, then remove pkgsReadOnly = false;. + node.pkgsReadOnly = false; + nodes = { machine = { lib, pkgs, ... }: { imports = [ @@ -32,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = let - configFile = pkgs.writeText "configuration.nix" '' + configFile = hostPkgs.writeText "configuration.nix" '' { lib, pkgs, ... }: { imports = [ ./hardware-configuration.nix @@ -119,4 +123,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail("nixos-rebuild boot --specialisation foo") machine.fail("nixos-rebuild boot -c foo") ''; -}) +} diff --git a/nixos/tests/nixos-rebuild-target-host.nix b/nixos/tests/nixos-rebuild-target-host.nix index 4a210f94fd22..0e4c3e5f3999 100644 --- a/nixos/tests/nixos-rebuild-target-host.nix +++ b/nixos/tests/nixos-rebuild-target-host.nix @@ -1,8 +1,12 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ hostPkgs, ... }: { name = "nixos-rebuild-target-host"; + # TODO: remove overlay from nixos/modules/profiles/installation-device.nix + # make it a _small package instead, then remove pkgsReadOnly = false;. + node.pkgsReadOnly = false; + nodes = { - deployer = { lib, ... }: let + deployer = { lib, pkgs, ... }: let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; in { imports = [ ../modules/profiles/installation-device.nix ]; @@ -24,7 +28,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { system.build.privateKey = snakeOilPrivateKey; system.build.publicKey = snakeOilPublicKey; - # needed to provide STC implementation for target + # We don't switch on `deployer`, but we need it to have the dependencies + # available, to be picked up by system.includeBuildDependencies above. system.switch.enable = true; }; @@ -57,6 +62,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { system.build = { inherit targetConfig; }; + system.switch.enable = true; networking.hostName = "target"; } @@ -71,13 +77,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { StrictHostKeyChecking=no ''; - targetConfigJSON = pkgs.writeText "target-configuration.json" + targetConfigJSON = hostPkgs.writeText "target-configuration.json" (builtins.toJSON nodes.target.system.build.targetConfig); - targetNetworkJSON = pkgs.writeText "target-network.json" + targetNetworkJSON = hostPkgs.writeText "target-network.json" (builtins.toJSON nodes.target.system.build.networkConfig); - configFile = hostname: pkgs.writeText "configuration.nix" '' + configFile = hostname: hostPkgs.writeText "configuration.nix" '' { lib, modulesPath, ... }: { imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") @@ -140,4 +146,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { deployer.succeed(f"mkdir -p {tmp_dir}") deployer.succeed(f"TMPDIR={tmp_dir} nixos-rebuild switch -I nixos-config=/root/configuration-1.nix --target-host root@target &>/dev/console") ''; -}) +} diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index cadf0c829d44..09ce3341aa54 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://xiph.org/flac/"; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; changelog = "https://xiph.org/flac/changelog.html"; + mainProgram = "flac"; platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ ruuda ]; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix deleted file mode 100644 index b17460e4e2e7..000000000000 --- a/pkgs/applications/audio/jalv/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3 -, serd, sord , sratom, suil, wafHook }: - -stdenv.mkDerivation rec { - pname = "jalv"; - version = "1.6.6"; - - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; - }; - - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ - gtk2 libjack2 lilv lv2 python3 serd sord sratom suil - ]; - - meta = with lib; { - description = "Simple but fully featured LV2 host for Jack"; - homepage = "http://drobilla.net/software/jalv"; - license = licenses.isc; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 5d1b11c4ef29..f4206cb0ea7c 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -49,8 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A real-time graphical programming environment for - audio, video, and graphical processing''; + description = ''A real-time graphical programming environment for audio, video, and graphical processing''; homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 550c0e8d042a..2284df444ec5 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -36,10 +36,12 @@ stdenv.mkDerivation rec { doInstallCheck = true; - installCheckPhase = ''( - set -x - test -e $out/bin/setBfreeUI - )''; + installCheckPhase = '' + ( + set -x; + test -e $out/bin/setBfreeUI + ) + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/optimism/default.nix b/pkgs/applications/blockchains/optimism/default.nix index 945ef865f964..73f26ee494b9 100644 --- a/pkgs/applications/blockchains/optimism/default.nix +++ b/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.9.1"; + version = "1.9.4"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-PlwpN8P1t0NNIU+Ys50dIXmfUQFIY9e1tLABiVK0JQo="; + hash = "sha256-pAmstWA6up0CvHEQW5RnDYumdwKP0i6fpz59EYTBsmU="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-n1uJ/dkEjjsTdmL7TeHU4PKnBhiRrqCNtcGxK70Q0c4="; + vendorHash = "sha256-Sr9OECXbRa4SPe3owMto2EbnAIygeIEmZv73hvA6iww="; buildInputs = [ libpcap diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 4616241a063e..1c9bff41d013 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -788,7 +788,7 @@ dependencies = [ [[package]] name = "asset-hub-rococo-runtime" -version = "0.22.0" +version = "0.22.1" dependencies = [ "asset-test-utils", "assets-common", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "asset-hub-westend-runtime" -version = "0.26.0" +version = "0.26.1" dependencies = [ "asset-test-utils", "assets-common", @@ -1752,7 +1752,7 @@ dependencies = [ [[package]] name = "bp-header-chain" -version = "0.18.0" +version = "0.18.1" dependencies = [ "bp-runtime", "bp-test-utils", @@ -2034,6 +2034,7 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "testnet-parachains-constants", + "xcm-runtime-apis", ] [[package]] @@ -2227,6 +2228,7 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "testnet-parachains-constants", + "xcm-runtime-apis", ] [[package]] @@ -3980,7 +3982,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" -version = "0.18.0" +version = "0.19.0" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -4050,7 +4052,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" -version = "0.17.0" +version = "0.17.1" dependencies = [ "assert_matches", "bytes", @@ -4298,7 +4300,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" -version = "0.18.0" +version = "0.19.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4344,7 +4346,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" -version = "0.18.0" +version = "0.19.0" dependencies = [ "array-bytes", "async-trait", @@ -5117,7 +5119,7 @@ dependencies = [ [[package]] name = "emulated-integration-tests-common" -version = "14.0.0" +version = "14.1.0" dependencies = [ "asset-test-utils", "bp-messages", @@ -8766,7 +8768,7 @@ dependencies = [ [[package]] name = "mmr-rpc" -version = "37.0.0" +version = "38.0.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10844,7 +10846,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" -version = "41.0.0" +version = "41.0.1" dependencies = [ "environmental", "frame-benchmarking", @@ -12035,7 +12037,7 @@ dependencies = [ [[package]] name = "pallet-xcm-bridge-hub-router" -version = "0.15.0" +version = "0.15.1" dependencies = [ "bp-xcm-bridge-hub-router", "frame-benchmarking", @@ -12869,7 +12871,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "17.0.0" +version = "18.0.0" dependencies = [ "assert_cmd", "color-eyre", @@ -13021,7 +13023,7 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "18.0.0" +version = "19.0.0" dependencies = [ "cfg-if", "clap 4.5.11", @@ -13695,7 +13697,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "18.0.0" +version = "18.0.1" dependencies = [ "async-channel", "async-trait", @@ -13875,7 +13877,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "6.0.0" +version = "7.0.0" dependencies = [ "asset-hub-rococo-runtime", "asset-hub-westend-runtime", @@ -13913,7 +13915,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-lib" -version = "0.2.0" +version = "0.3.0" dependencies = [ "assert_cmd", "async-trait", @@ -14037,7 +14039,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "18.0.0" +version = "19.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -14137,7 +14139,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "bitflags 1.3.2", @@ -14197,7 +14199,7 @@ dependencies = [ [[package]] name = "polkadot-sdk" -version = "0.6.0" +version = "0.7.0" dependencies = [ "asset-test-utils", "assets-common", @@ -14699,7 +14701,7 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "18.0.0" +version = "19.0.0" dependencies = [ "assert_matches", "async-trait", @@ -17311,7 +17313,7 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "criterion", @@ -17856,7 +17858,7 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.45.0" +version = "0.45.1" dependencies = [ "array-bytes", "assert_matches", @@ -17961,7 +17963,7 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "async-channel", @@ -18000,7 +18002,7 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "async-channel", @@ -18072,7 +18074,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "futures", @@ -20992,7 +20994,7 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "frame-support", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index a7ebab1736be..89cac46971b0 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -1,15 +1,16 @@ -{ fetchFromGitHub -, lib -, openssl -, pkg-config -, protobuf -, rocksdb_8_3 -, rust-jemalloc-sys-unprefixed -, rustPlatform -, rustc -, stdenv -, Security -, SystemConfiguration +{ + fetchFromGitHub, + lib, + openssl, + pkg-config, + protobuf, + rocksdb_8_3, + rust-jemalloc-sys-unprefixed, + rustPlatform, + rustc, + stdenv, + Security, + SystemConfiguration, }: let @@ -17,13 +18,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "stable2409"; + version = "stable2409-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-${version}"; - hash = "sha256-QNjk2lb04VLYpwbE7hmUVaujijX9nkZxVdseTS1G85E="; + hash = "sha256-SbQaauElMNuCg0q6aN0ckg39huNZyiq8px9iXWFFtyc="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -53,7 +54,10 @@ rustPlatform.buildRustPackage rec { buildType = "production"; - cargoBuildFlags = [ "-p" "polkadot" ]; + cargoBuildFlags = [ + "-p" + "polkadot" + ]; # NOTE: tests currently fail to compile due to an issue with cargo-auditable # and resolution of features flags, potentially related to this: @@ -68,9 +72,13 @@ rustPlatform.buildRustPackage rec { ]; # NOTE: jemalloc is used by default on Linux with unprefixed enabled - buildInputs = [ openssl ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ++ - lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + SystemConfiguration + ]; # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't # available for `rustc-wasm32` @@ -84,8 +92,15 @@ rustPlatform.buildRustPackage rec { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; license = licenses.gpl3Only; - maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ]; + maintainers = with maintainers; [ + akru + andresilva + FlorianFranzen + RaghavSood + ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. - platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86); + platforms = intersectLists platforms.unix ( + platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86 + ); }; } diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 5d4031b064ec..7bd09e5defbf 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -99,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libresprite.github.io/"; description = "Animated sprite editor & pixel art tool, fork of Aseprite"; license = licenses.gpl2Only; - longDescription = - ''LibreSprite is a program to create animated sprites. Its main features are: + longDescription = '' + LibreSprite is a program to create animated sprites. Its main features are: - Sprites are composed by layers & frames (as separated concepts). - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix deleted file mode 100644 index 9c230a2984eb..000000000000 --- a/pkgs/applications/editors/scite/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2 }: - -stdenv.mkDerivation { - pname = "scite"; - version = "5.2.2"; - - src = fetchurl { - url = "https://www.scintilla.org/scite522.tgz"; - sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - sourceRoot = "scintilla/gtk"; - - CXXFLAGS = [ - # GCC 13: error: 'intptr_t' does not name a type - "-include cstdint" - "-include system_error" - ]; - - buildPhase = '' - make - cd ../../lexilla/src - make - cd ../../scite/gtk - make prefix=$out/ - ''; - - installPhase = '' - make install prefix=$out/ - ''; - - meta = with lib; { - homepage = "https://www.scintilla.org/SciTE.html"; - description = "SCIntilla based Text Editor"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.rszibele ]; - mainProgram = "SciTE"; - }; -} diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index 82dd13920b02..06b7290c4baf 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -43,25 +43,25 @@ rec { meta = { description = "WYSIWYW editing platform with special features for scientists"; - longDescription = - '' GNU TeXmacs is a free wysiwyw (what you see is what you want) - editing platform with special features for scientists. The software - aims to provide a unified and user friendly framework for editing - structured documents with different types of content (text, - graphics, mathematics, interactive content, etc.). The rendering - engine uses high-quality typesetting algorithms so as to produce - professionally looking documents, which can either be printed out or - presented from a laptop. + longDescription = '' + GNU TeXmacs is a free wysiwyw (what you see is what you want) + editing platform with special features for scientists. The software + aims to provide a unified and user friendly framework for editing + structured documents with different types of content (text, + graphics, mathematics, interactive content, etc.). The rendering + engine uses high-quality typesetting algorithms so as to produce + professionally looking documents, which can either be printed out or + presented from a laptop. - The software includes a text editor with support for mathematical - formulas, a small technical picture editor and a tool for making - presentations from a laptop. Moreover, TeXmacs can be used as an - interface for many external systems for computer algebra, numerical - analysis, statistics, etc. New presentation styles can be written - by the user and new features can be added to the editor using the - Scheme extension language. A native spreadsheet and tools for - collaborative authoring are planned for later. - ''; + The software includes a text editor with support for mathematical + formulas, a small technical picture editor and a tool for making + presentations from a laptop. Moreover, TeXmacs can be used as an + interface for many external systems for computer algebra, numerical + analysis, statistics, etc. New presentation styles can be written + by the user and new features can be added to the editor using the + Scheme extension language. A native spreadsheet and tools for + collaborative authoring are planned for later. + ''; homepage = "http://texmacs.org/"; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c6a826f386b1..2cca961bd128 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18756,5 +18756,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + NotebookNavigator-nvim = buildVimPlugin { + pname = "NotebookNavigator.nvim"; + version = "2024-05-23"; + src = fetchFromGitHub { + owner = "GCBallesteros"; + repo = "NotebookNavigator.nvim"; + rev = "20cb6f72939194e32eb3060578b445e5f2e7ae8b"; + sha256 = "sha256-+FLHJ1tfIplXhO/6kajdcDBTIsNYN9kCOR9IdhXL6d4="; + }; + meta.homepage = "https://github.com/GCBallesteros/NotebookNavigator.nvim"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d977d0ac9df1..6b170299b217 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -149,8 +149,7 @@ in vim-fugitive vim-rhubarb ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "advanced_git_search.utils"; + nvimRequireCheck = "advanced_git_search.utils"; }; animation-nvim = super.animation-nvim.overrideAttrs { @@ -236,8 +235,7 @@ in plenary-nvim telescope-nvim ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "chatgpt"; + nvimRequireCheck = "chatgpt"; }; clang_complete = super.clang_complete.overrideAttrs { @@ -1529,6 +1527,10 @@ in nvimRequireCheck = "null-ls"; }; + NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs { + nvimRequireCheck = "notebook-navigator"; + }; + null-ls-nvim = super.null-ls-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; nvimRequireCheck = "null-ls"; @@ -1588,8 +1590,7 @@ in nvim-lspconfig nvim-navic ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "nvim-navbuddy"; + nvimRequireCheck = "nvim-navbuddy"; }; vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 07f334bdaa7b..c35abdb75ab3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -19,6 +19,7 @@ https://github.com/Yggdroot/LeaderF/,, https://github.com/Valloric/MatchTagAlways/,, https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, +https://github.com/GCBallesteros/NotebookNavigator.nvim/,HEAD, https://github.com/chrisbra/NrrwRgn/,, https://github.com/vim-scripts/PreserveNoEOL/,, https://github.com/henriklovhaug/Preview.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 33bc3153b786..6faa812d4423 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -697,8 +697,8 @@ let mktplcRef = { name = "biome"; publisher = "biomejs"; - version = "2024.5.251958"; - hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo="; + version = "2024.10.131712"; + hash = "sha256-wslaPz0YwavLgP/gLXDIKsk2dvVmFgkSDCI9OfpKwwI="; }; meta = { changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md"; @@ -5194,8 +5194,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.8.0"; - hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; + version = "12.9.0"; + hash = "sha256-ULjZlbGcVbPiokfnx7d4z7cmVVEfy2d+SUch80rZRA4="; }; meta = { description = "Bring real icons to your Visual Studio Code"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 006715d87f04..54da7fd960d3 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.19"; + version = "9.20"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-LBOgw/MfJaVNQV2GeFoa1G74oHrpc7a2mTRaRSBqwBU="; + hash = "sha256-lfK0WxRYElvn2fzMlMpfjM4KXkrhHQ0ZPPt93bNeeoY="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-TKW8y8kPsI0af/nEr3rU9nH49I77u+/6CHE64JgdkOU="; + hash = "sha256-ewozuCtYPaV9d4XD9sdRGMfJcBIE13TC5vNEWdbcGCs="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index c90a372681a3..06e2cbef1f24 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -7,7 +7,7 @@ , libsForQt5 # unwrapped package parameters -, withGrass ? true +, withGrass ? false , withWebKit ? false }: let diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index 56a15dbd7ddb..a588ac6dbd6a 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -7,7 +7,7 @@ , libsForQt5 # unwrapped package parameters -, withGrass ? true +, withGrass ? false , withWebKit ? false }: let diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 8eae4fda5f8b..c1efa72ad120 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -16,18 +16,18 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optical character recognition (OCR) program & library"; - longDescription = - '' GNU Ocrad is an OCR (Optical Character Recognition) program based on - a feature extraction method. It reads images in pbm (bitmap), pgm - (greyscale) or ppm (color) formats and produces text in byte (8-bit) - or UTF-8 formats. + longDescription = '' + GNU Ocrad is an OCR (Optical Character Recognition) program based on + a feature extraction method. It reads images in pbm (bitmap), pgm + (greyscale) or ppm (color) formats and produces text in byte (8-bit) + or UTF-8 formats. - Also includes a layout analyser able to separate the columns or - blocks of text normally found on printed pages. + Also includes a layout analyser able to separate the columns or + blocks of text normally found on printed pages. - Ocrad can be used as a stand-alone console application, or as a - backend to other programs. - ''; + Ocrad can be used as a stand-alone console application, or as a + backend to other programs. + ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index a38c247e7f21..166f5c785dd4 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and simple image viewer"; - longDescription = - '' Viewnior is insipred by big projects like Eye of Gnome, because of it's - usability and richness,and by GPicView, because of it's lightweight design and - minimal interface. So here comes Viewnior - small and light, with no compromise - with the quality of it's functions. The program is made with better integration - in mind (follows Gnome HIG2). - ''; + longDescription = '' + Viewnior is insipred by big projects like Eye of Gnome, because of it's + usability and richness,and by GPicView, because of it's lightweight design and + minimal interface. So here comes Viewnior - small and light, with no compromise + with the quality of it's functions. The program is made with better integration + in mind (follows Gnome HIG2). + ''; license = licenses.gpl3; homepage = "https://siyanpanayotov.com/project/viewnior/"; maintainers = with maintainers; [ smironov artturin ]; diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index 3f5e36886836..52a1245610b8 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -9,9 +9,10 @@ mkDerivation { homepage = "https://apps.kde.org/picmi/"; description = "Nonogram game"; mainProgram = "picmi"; - longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or + longDescription = '' + The goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. - ''; + ''; maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 914884a9aa2b..b5b246526063 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; + mainProgram = "keepassxc"; maintainers = with maintainers; [ blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index d28a9e52a902..13466240ffe0 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -1,4 +1,5 @@ { + pkgs, mkDerivation, lib, callPackage, @@ -17,15 +18,17 @@ libevdev, makeDesktopItem, fetchurl, + fetchpatch, + wineWowPackages, }: let - version = "2022.3.0"; + version = "2023.3.0"; aruco = callPackage ./aruco.nix {}; # license.txt inside the zip file is MIT xplaneSdk = fetchzip { - url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip"; - sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba"; + url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip"; + hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo="; }; in mkDerivation { @@ -36,19 +39,30 @@ in owner = "opentrack"; repo = "opentrack"; rev = "opentrack-${version}"; - sha256 = "sha256-8gpNORTJclYUYp57Vw/0YO3XC9Idurt0a79fhqx0+mo="; + hash = "sha256-C0jLS55DcLJh/e5yM8kLG7fhhKvBNllv5HkfCWRIfc4="; }; + patches = [ + # https://github.com/opentrack/opentrack/pull/1754 + (fetchpatch { + url = "https://github.com/opentrack/opentrack/commit/d501d7e0b237ed0c305525788b423d842ffa356d.patch"; + hash = "sha256-XMGHV78vt/Xn3hS+4V//pqtsdBQCfJPjIXxfwtdXX+Q="; + }) + ]; + nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems]; - buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco]; + buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco] + ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ]; env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; dontWrapQtApps = true; cmakeFlags = [ + "-GNinja" + "-DCMAKE_BUILD_TYPE=Release" "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" "-DSDK_XPLANE=${xplaneSdk}" - ]; + ] ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ]; postInstall = '' wrapQtApp $out/bin/opentrack @@ -60,7 +74,7 @@ in exec = "opentrack"; icon = fetchurl { url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png"; - sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn"; + hash = "sha256-9k3jToEpdW14ErbNGHM4c0x/LH7k14RmtvY4dOYnITQ="; }; desktopName = name; genericName = "Head tracking software"; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index ca2b0c033ee9..fba55f73ca7c 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.7.2"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w="; + hash = "sha256-5FZDHKYv3/ZEzb0tsI7wxydDU0p7zwfhSG2i4UScf6s="; }; - cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo="; + cargoHash = "sha256-7SMIN6Nu9W6t27+YoCbJt0HCkNhw/ZU6pn6qRYvrgT8="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 4790d433647e..7cb59e2c8c2b 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -116,7 +116,7 @@ buildPythonApplication rec { ]; # check phase uses the output bin, which is not possible when cross-compiling - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 5ed42ab1fc29..6789c33ce29d 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -34,16 +34,16 @@ stdenv.mkDerivation rec { meta = { description = "Lexical database for the English language"; - longDescription = - '' WordNet® is a large lexical database of English. Nouns, verbs, - adjectives and adverbs are grouped into sets of cognitive synonyms - (synsets), each expressing a distinct concept. Synsets are - interlinked by means of conceptual-semantic and lexical relations. - The resulting network of meaningfully related words and concepts can - be navigated with the browser. WordNet is also freely and publicly - available for download. WordNet's structure makes it a useful tool - for computational linguistics and natural language processing. - ''; + longDescription = '' + WordNet® is a large lexical database of English. Nouns, verbs, + adjectives and adverbs are grouped into sets of cognitive synonyms + (synsets), each expressing a distinct concept. Synsets are + interlinked by means of conceptual-semantic and lexical relations. + The resulting network of meaningfully related words and concepts can + be navigated with the browser. WordNet is also freely and publicly + available for download. WordNet's structure makes it a useful tool + for computational linguistics and natural language processing. + ''; homepage = "https://wordnet.princeton.edu/"; license = { diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fe5dfae33714..4a2464681b2c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1035 +1,1035 @@ { - version = "132.0b6"; + version = "132.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e25bc2af3eead50c85ac7788071ce95c2e6833758b82a8f5ce5ccff75e18399c"; + sha256 = "2bf1ccf753ee0f63de4c99dce1947add6ae443a3a7c016edcc7c2c8db2483e90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0e2881eaceedf139d43671b24f5a97c95ec0e78afb6635767d058fecff2ee44c"; + sha256 = "7fc7eef2a27e86355628a32c341372a1c9029f25d5791e9f5a5e4a702f4efd0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5d7b05d76aa98a67fac2bb1e7ed3382e5a773ed699732b7ceb36bbdf2f7f42a6"; + sha256 = "fc5bf48ed17526b860c282070bfc7475516cf8cb3dcca1f5943c239b225254d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "240fa78947be010e9a25a9d7a7a05a5323a19805af42a0b3ff10fb716279e40c"; + sha256 = "6e600a4d224af329f98e8898207b97d568aec7086f3dbd3aebf64756818a7bb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "eea78ee53aafc91f04f2d517f52038e1c8c45cb3dc48cd291e0bbb7c7e71274c"; + sha256 = "d2f5adc71fe72f8d17fea11b6d9c0cb32fc787ea91320ecb63d9b47d774954f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fd27ce68a63e48b10c6ca1f54d5964a957a79052ea86eecc3e4ac56f41dc3dd1"; + sha256 = "cf7f020204382c7bdd5134aa436c77aa8c2d97a67cde6875560aced14ed6bc12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1d0895eaae18d8015b6d87918c09956d466e69332c7f6f7c135fc344f7c96de1"; + sha256 = "1dbbd2b1b36bdbeb93b4f2702b0567749903adb45161468287b4d0b267c1df5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fc66226a6bedaf0cbf197674fe1a22a375f0e3b4063c657c1e74247b5a21d387"; + sha256 = "dddb31bbdd0eb21551ec2f8223cf40d30ab4436b381f9cdaf6011afd85f7464b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1d76f516a6612f98e70ff4f6e139a8cc0e94c1b59741997c62c2e7d5110bfb78"; + sha256 = "aeb5cfe60baeecfea03c68d610b0296a76e3481d15c656413a16cb102042d50c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ea7eb2fd67e35c630609cc002cd7fdcfa2ca8f9fc8075306f176fa1a7e32ad81"; + sha256 = "723f991b7c27a6cfdf35e9eb21a36c5b16b3ff5f89d38c31f53dcd81ab03a194"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ee0b412c54a55c3c3a76addf78f417492117da4c60c09acc5c8833f13cc13197"; + sha256 = "1fc1a108d18a2c12413fbbeb4f5b4d3a07ae5ba7ab987087bcdea9cbe8477579"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8d87382885ca5eb0f7e7cb404b66773da755a61f23f7a5bd26e55f870a573a6e"; + sha256 = "0164347e61ec42124bcd92d9cdda3cafbeff1a1bfc90f471a7a466de8ef81074"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f9c9046cad1b9101bb6be189dddc0586ac6ca699ac17a6781e4f2514c231dc47"; + sha256 = "c6951037e07d9c97ab3490d486c1698222ba99e3e6e61bd8d5916172d0538ce0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b1b562134bda139e48ecae233328a4c46fa63985cf3f30aa1788e6c5107f1d0f"; + sha256 = "2ae7d27b0cd4066e9804fc499ded8d0493e6ef93a76a2e705c4208dbaa0748bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6ab5dbb55d44bf2bd881daf82b55ad3927aac541d847ea78832d44bb3edac17c"; + sha256 = "d9bffc7e6f9ab2ca00716d5df6cf552034d7c5d12922b71b34d2e8aae2bff994"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d4b43431cb1b2c63edea0d1e7f547251397151f93337796169c7daf74dff92c2"; + sha256 = "792862fb4834aa7b6126400059dc86ab476066683f3197f428d734cdb15dda55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d0202d86602613fa49fbb1f5e747cdf08952ce398809832787553efef23c85e8"; + sha256 = "fb08cc0f8e783ec931a2714f362b46327e031ac172613e5cae26d40be3f2b44d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "961e353920d4f68ce18ed2a052b1cec3b68997511e2f587ae5a90f093d9d2d32"; + sha256 = "45cb5a2905fc963269c4c5cc815d4259afaf8d8025bcfe1a19f88e52f5c42ac5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bcebd528252103a6c35a13d9ba74ecedd21df421363e2a02527def78d195e229"; + sha256 = "e9e85f24c36ff6b7e2fb49965a7c4c6210b75f81c42487ad4c918ace9f41c5c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "88be7e9729108ecf6ce9df63e82fa00f448387c67ee022693034eb4e93100ff2"; + sha256 = "ff1b1fd800fbac9e27b3af66e0d9c350d42a70256d954b502663d1f482f8cf73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4f18dd9faca0c9e958c7a051a6087d604c3818f7f8812f03e0fde90b2a4b3020"; + sha256 = "70fc2d9c20712adeab3307f951e78d858d936feda102a30d272eff88866c6bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8571187956ebe889c68ffdf6bdf8cc2ad7ab3922bdda55b13c2d20319ccd9439"; + sha256 = "9bb160c8a19eff6a9b53b2c5bebd1bc10c37dbc3bd15257b1e6f6cf09b71824a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4a698b38b8fbcf2bd31eddde0516d3ded002a931bfec2f8c25f2aa12374705bb"; + sha256 = "702b2e7227e8ec775da12f293381e41a22623818a4af51040b71843c07aadf47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "69d4d15a2fe7ac61e88f9d9da7245892d41b233eb88f693b5333285512485e27"; + sha256 = "7c266f6fe02cd073a7811901d6d2d3f3ed86ddc552d4a06ffd179734235c012b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "010819207dd46a9fb08df54d1584d4592b03155ed47e328f833ed84c3b742e70"; + sha256 = "6d14f75b49a7fdac8b89283bc017191a1f8dc708223cc68641752d0f84e85835"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ca36cbac24586894e4f3a5c91c23358657699170006cd341636b0e7df1ce5feb"; + sha256 = "18d32f6a1d582d9a4e8e427d0c6269eb744296ca21fb0bd609d4f0c0361c36fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0d18c2b0a21a1cb6965c3d468994fcf06f828554c76e9d3a369df46272b67276"; + sha256 = "55b77f39bbce79dfe835b1d15cc732b4079614251854db47cf6446726213ad7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3dcdafb0e434fdee06c1a8a90f173754125b60542629ef2903ede4111e412138"; + sha256 = "5a0cb2c3c93615045ad9cadac0922759958bafb0bf35cbd88155cc3b8a9eb66c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "60e9d139098f958d2081e585744fe439e9a21da8e42f440b5596f11a794585e0"; + sha256 = "db06ff41080c04833bf32323fb3602c727f097a05c88a48d69f901bf6be9d9ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5cb5b3310c9d83ef60edc981ecb9cac86a37a6aad342cfd4de5993c2a5e5890a"; + sha256 = "beaf66d72bd859d671647361e53ff47f4767b89521c477022387638b57693801"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "119d0c451b376a9b7ac07a8a66b22b1dd4e3224104da70e432b960693eac8b91"; + sha256 = "07a74c134fddad0bc3d9e248734df32be97ce099c81ae3e301288906cddf8623"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6d1e5478b6daba5f38706d762371c63660b91c287b24cd523b2f69f04c343d9d"; + sha256 = "2a4475d0e18b8817d605c76e153b97703ffdeb1c3ad887820ff16d3d41580ab8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "329b9bfe890bf3c26bd8fd1f5e505989d983c0fb8e47e84fe88cdab8b07dfd6b"; + sha256 = "e5c0d17e4e701d357601dc65bfdcd26bb805e10c28c9bd2ee252485cb12a175d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "54687eb45d0a991e137c2c1634f3502365d479c3ca673f9632d3186499624013"; + sha256 = "489b5823e83899733ad2f94f03205518f55ca8d0fc66799af06c966b48fc528c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "66eedf169feeaab1e9c7996df987ed6f0a3f0efaaf854ffa0f1cfa657b88809e"; + sha256 = "82d702031a08d80143317d816bd51a40e3affaa47d2fd30c46f05d56123c2f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0943d17fd1a304b392f03247205f8ac9921a6572ab1fbe951eca591534236304"; + sha256 = "86ce2d02d6e38ae4a36ce3543be3335508ca83ea8fce3a0340519ef6fb2d3b9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "fae0777a01c5b3d01abceebfdd347f6c6e5cf7fc2c7e955dcf282a83fa7c7a45"; + sha256 = "c934c385f2b1eb801c6fe5e3a07bb98516133d070124db48d55c00e578b2840c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "179fcd7a6e1d5d8061eee8dfc232e320f9f1f240bc9b720293acc55979e7dc12"; + sha256 = "aee8d3793cc460f138a2bd9c9415e4e10ccdd4d0babb2ca1f9e92999f32702f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ebd4b70176296f7833c17a62d91255ee002f72a6915a6e6b900c37a169c9af80"; + sha256 = "9cacc88b8b11e9716e927e0710a07d1d1e380a8a0b4c8c4889a57b8bd2b000ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a75fbcd8ba47d58cd97cef837b410bf6e75b44df5d8a079c4b268c60fb91898c"; + sha256 = "a3bc5062e804d651dd6d630f9b8cc30683b40f02821f08e8ace1f0bec276ca63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "55dc7502274b2d8b01e2bde554bc101cb5b370dadc816f225166790ca90f9985"; + sha256 = "660345a284c5f87176f6b11d3eb58c86ab793021ea0db084f408612812bb1210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "18f74efef4ecba385b66652a581abaf3e399286035a8b48d716f0716d8c5a1e9"; + sha256 = "20302195cd105b8ca8a925450a499997ebf9464ba8d0fe0067f92605f0d1ad6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "5fb6f9d4660095276690e510ab92e939855d1a70ff7fd8985f66b63340968022"; + sha256 = "fe47c61ee2f11d48d19bbe8402d0d8774ef874e777db84fec934f5224691d923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7b92150274387c1a58eef3141b0e8981579b0b9966fb7a381dcd88deaa47b5cb"; + sha256 = "b1d5cb3135a1ede6e77f613e746e06198c98542bcd652e31482426065d7cd43e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "831036e8c730e25fa4faf32101190b9cc17c621f53c3531898929a692d1cf404"; + sha256 = "e66f0200113dcc156301640da227e29f55dbbaf641f40ef0c261a7d4637fb640"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bbf9078736b5d89a7c9e252c341977ba5f5473959ff20e8a8c804250433bf1f2"; + sha256 = "d2a9db19180b7e25a30065cf463a1dca4597d9126ffbfaee4d439579a83fd66a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d80455c003e4bc930ad90cba0c1ac2c353f40ee62d46eea9ace9e04b1aa426d2"; + sha256 = "14c10fa0999330ade75cc7263de98af35b5f2e1717d7ab8ee7399ea2b7f50290"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d7cad9bcbaf604105ac3b5a40aa0edd249d3e68e023a96a7893670b8f88e943a"; + sha256 = "ee3ebba089bdabcbedba1f467dff81b7202c6d0dcaa606fc2969c978c1b3598b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f0132ac7c33619ca15babea69a13852c07e28212add00812ba992bbdbbfda484"; + sha256 = "747d5f79b521227b64a11766e86c0691e314ebbc33ae72a3033c125db475667f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "02c012807824b92296c94ec4770633e0b7b1aa1e4cca11fe390d77264a8f5836"; + sha256 = "d4f69a8199424828c31df016ee36b54f7d1eb0bb2226ba527826ef84ab5d626e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "493fc9938e2cf097ec2969aecc1b5cfcecccdfc99680eb4d53f35cc82d0ea674"; + sha256 = "8764267032aef6eb4353587c79e3d309581b8430c0fdbe221b55c3da0dc91e66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d1429390dea25b931143963f67594817a3a9c206ac51f2b29173306ef208b0cc"; + sha256 = "13e5b0a94146880224fc2a7287aaf82535fde1842d3da323fd515706d60e9502"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "021292b8028a6ae18a41176718058d436b8b5a1dda4d3c7e0e49e31ed556468d"; + sha256 = "ae47af49caa90b98d8e400c49f1a48c4abf0186c142d3cf6b9be4d87415950b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "457c961054f45be98ba0f6add85a712d95375b59505b04e4cb9e1154e9289909"; + sha256 = "f1b3ed5ee5271208e4bfe3c4a5a08a79e4e8f0a36b2b59d041de805381f293d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "91a4327d47a8f259e99204fd806699de7054b9244b0bb8146471dd3a63e2d076"; + sha256 = "bb9e9e2c6c9d7a7a4d4a97b1553df76283a973936cb5b728b48de1593bd7f03d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7b603a91f18b3f377cc34ad30f004a52dd7bde4dcc7f672f74bb562ef540c30b"; + sha256 = "b218e8b43eae13aca4c8f0756af5b1945a566eb414c40c412d7c451f32faf632"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3eb92c102cecdefeb4e73010f2cd6120d9390330fe746ea6ea7113ba54ae9518"; + sha256 = "d17b594fcdc6b7c31b89cecc2f5ce17ef8205589cf2d04b31faead6f05f35918"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "86d3432271bdbb33b9aa218d5a11909f6fb183cee62d71808b9c820a0616eab2"; + sha256 = "07125d837dfa9934df26f6a55ab210471b24407b22905b241652ebeac4600c17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "56a7a3e8ce7877f9e6d50eada51935b9c751780dc90c4e8cffb19940f17fccb7"; + sha256 = "4c3494d7751926a2ee7f04dc037193cd81a3f7886f074a23315e34bd6bb63943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b50355988b3d276643353cbee06ad05c7a4e1ca671eac9d8fe54bf787d62e0ae"; + sha256 = "3140355fe1abf44aeee01bf6ac46756580fac82a222b1443046b33af8ff16427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "aa8f7ad9f5c4aeae3ccadb86da303599df1fd459ad6aee0450fe6b6674b6cd44"; + sha256 = "7953ceaa9abe716a52b7f5831fe50fdb7f31507ea8fa64a6e834f08562807f73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "111eb6af1ac41984af10c5576b0f79d1747360c679fe4cca84915656f1b17b8c"; + sha256 = "570aa3350c57f763e2686784dfc0927f01e402442de11a47001d2b673e818848"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "43fbe5f3d22bf5a671c157dce6632b9f30cc9ed9cc22d7ffe1c7939329d0b1cf"; + sha256 = "562e69a74017ff55c0961b9e73d8d4b45f4aa10c684dacc7b3049d7f3609b1f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2f48806fb111cb14933453868fb485758ec4c9c68ccd37799767a3c21cab0eec"; + sha256 = "7982e8b10ce2003b95c037c02d8a068d0eea8627bb2c41880fe60f8c796736e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "da074cf7baadb63e1c9a3abbfb91ffec3a5803d4f7670eca6ac7480b183c9cf5"; + sha256 = "b9c8a73add36261e9a557fa88b8c7f4d8c2f8c6c109c1e953aaca1b0bb88ab1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "851c9436912128a0ae64aa7e1a9f990df503d69629c2ef4e926e0a6d8aeeb2b7"; + sha256 = "4e23ee1cce05d76b63ff3fe2013dda86159caf0bdbb9df0dc9fadd4b5b027523"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d542a9954f7021bc4720b6eccd42aac48115fd9efad927790daa49613f8f90b5"; + sha256 = "0c8b73bb4b93937ee720f83eaac9ef4b0830535ccc3291212196618b37d60edb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "dcc631be5ac05352bbc1168038a701be825f4ea003db86dc0b5f2e1b3c9791cf"; + sha256 = "84f219c7f0e59483f70ce45758b7a11687eaa1fc2e5359e66d01ccab2dc02ce8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "7b8f99d8cd68224937b5058524083d58934ce9122241d77cff61b1d33a8fc5c4"; + sha256 = "cf923abb277ac84d493b49e3e0e82741a306291b5ccb38ec7a904c9a5d6d495c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c36995dc2249eac5d7ca667315d09d9b59a5f2cf60ad95306217377e0c10921f"; + sha256 = "da9da781dee20e4b1ea5cc07473db80e64119a250e98ec36858f182c7c387ddf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ff5f11f855c84eba7852e786634b5025ffe41dc7eef3639123a441b2dde791b7"; + sha256 = "873ed71616863ff86bb5634e452efaed4c0ac876127e36274bf8f74417c37fae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e84813f0dafa0043a89497d865e80ebf11bf7217f8f911ecd94304e9df6b60e4"; + sha256 = "b33edf7736e12a74514f448caa3018c0c5b6eb6ee7c942049e3a6c8ea10968ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2cb87ce508563542960442774d8f7f830e70b22772176905234422bb3da3eda6"; + sha256 = "e9ed9d73bbdffc132e8af99d347f45e6172cacdceacde990c1acae09adfbc47f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6249dfcfc04b954adb3f189c78cc2a383f3ec40b404ac11956e10f12f4bf816d"; + sha256 = "21dea9ab323d83353cde05d982c16266e04a3d006338b81120408612d452d03a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7d57212324302b5d926be44567efe41a13676aed4f0f82072cf1cdb204919733"; + sha256 = "bb55efb232b0991ca144c9a8b9d1c627c2ee1d52af5f02c551e5f130d5c8db33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aec8f5e5749c4b72faedd53d339dbf6cbd6fa08e1ae840ddd4b78c4bc85efaab"; + sha256 = "8f98c37308f9a0e8187bd39a8f8ce2b95cdf560d66186ae593bd4f340334fd88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "10c50f4a9781dbcc9ea55b419bb7e152eafbb699d021052eea904260afa3263e"; + sha256 = "19e2225b259e7c924355f17427e6ec0fe44b3240ffe407d7e9afd058c4392bae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "c24b08ba6b2053194c1afeced698d9a0c82613ac0fe68e37d8121fe26f1f0a15"; + sha256 = "7403024526b6fac55a5fcb9b955ba263f7687905fc05c799ac7ba2238f61334b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "4e560df815dfb2f2f241b66c9fc0bfac35d17924b7039b2e583e604ce787d90f"; + sha256 = "a5c914708663bc93198bc5f02ff69c38276f330f8361ce05693d2e1b2eff4f44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "21e82b0c3789e570649704aa2045e6a1c18efec509bccad61479001fd4153e67"; + sha256 = "5a3fef5ec53b1a1df4945be65f276bfbc6581a8b75f7be59de5ff1f4466816b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ea0015c32dc1e563bbf551cdc2c68d80fd2201d0b6a692753f67fc0046f5a8cb"; + sha256 = "5910de36de93d6c882f0f09335cac6ea114552f0d71bf1a02c333d1c47ca8ca7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a7ffed45b58328a8b20f62fee06a1962335e2e33fae05d549f1f51d823ce8976"; + sha256 = "b3d3682fbe7a7bb3b3fd469ce02746522d170b82674f318b43271452e6f1f83b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "17e5c43d28de384c99db927cd81e1f3e0c2aa14bacbd912e53f82e8761dfb8b1"; + sha256 = "9561167751a7a92881f9e9b165e0e1868fa42f4a148cf87c4b0d83ae750b026d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c4fb6580921e5e10e726d264bb9aff52bfb42f4b262f16baafe5fa77cef14925"; + sha256 = "f63dd87205f973a5c195fed943e1a8117f80239f4bb4811a6ef45be136a43426"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "cd65f47a1809eaf8ebad9af6c4ae40f9f1cafa7fb37d5c59252c309870487594"; + sha256 = "15b0ca1537a31935ac1810db22b5b8796c21928bb1e8559726831727e1ae1509"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "553e14f9a6cc7a91e7ae4331a0c6224be0b3740f11ba139e1d1b47e783583e4f"; + sha256 = "03af525e5b94adad4f490bc47948655dce0284d2334e0d8d65b06fb329318bd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f751e253f51b2e4cf0816c5fcaaf89d0bcf3f5fa690f40668cafe0cd50c28c43"; + sha256 = "7f90b364b0f06e31922e3bd740bd326b17afd6e9a79b483ad52ef9ea0704892b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6e57f8f0fc31caf4227c7339460deacac7bbfd3f432c49a5f7b4b8edf71f55fa"; + sha256 = "a9c31aa43d793c1e07ace4c5a1896684174e329c9cc6c8812cca71a7e9b6c1b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "3d38fe4cf2b039af03b7e8be73cb35d529a0008a984ab4936afafd5c163a7a16"; + sha256 = "edbfcd159eed4e4925b159803e9832b7d9c455aff69a2be74fb64bf04f2a34a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7e5e5e2aa01985d6241f4327006c27651e76f7e1c3855c75656485667f38dc0c"; + sha256 = "46f12f7b489cab1870711e73528b5fc5275c77e3a6d9c1c5a9bd93b4b8d116fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a313c3be09fa343da4ab869785b0a9c04dbdea979398fa3697fccc4a1791bc20"; + sha256 = "dbf2a01daeb6c79902f77e17ecd120c57910cd4f9a72265ef6b5b98dd87b7f93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "de9433a353d8cd8ed95f88a207e267cda90d17699025dea658975b7f0971068c"; + sha256 = "490fe02bfb5a1c07d59a6e426a47b19f9757e5cae7d571c4ee44e5883759ad18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2dd35f8f097147aa9b4d7272054ed80ef644b3898a366385ee68862cfc9dd161"; + sha256 = "60c8f3e6ab1310899e71a05537b1fa58768835de80cc23b6f35bdf1ef639d0ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f245fe6a65cd50b97106a6e4cd1d0d0bde221523c3969beb64abadd9318adb73"; + sha256 = "71281fced8f188e9ae6ca062468c5394a1e48448962646a8c09e0227d284db01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fe0d0cd53fa7fb6586b7b76a11471b9402e636342c6a40cfd12b80ab80018eaf"; + sha256 = "9929c7799792edbb2646cf09f953ae9252fcda5eccffdeb156e35e166ea68a59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "af7ca43a3dad5edfb8c85f337fe1e5ca6bb9c444eab5241f85967d803132be38"; + sha256 = "f5ff3492dc8fe6f7afa85fcbdd92cf8ada3adac59b72e41ebd61d666dd00cc03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7c8c34619ef8b378fd55320667c9f342a80042164612038d53bf617a1c8bebb6"; + sha256 = "0701dbaddd0d9ec72680fc1104487f2635a518b6ae6fd14f2ab113ca62c8e733"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5a55235e42a4ee956697a158d40e8b1b6e1b9b327868be0f363ce470044261b3"; + sha256 = "337962a7518ac5d69c694aaff30b6d59e7597b298d60ae19a5cb14a3753d9426"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2dc26b6ceec6c45c818dee7cbc0e22ce5c1fcb1628407e573dd821a0e467345d"; + sha256 = "74fa5b76b72495eb864d78cb02c06fdf2fcf92f2e73d1baf01c1ca555ebd947f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b145ddc7150413a26649c46d0363de51b12fce1aa7051007345bb43388af0f3c"; + sha256 = "eab1a95b5d91bdbdec164c6732be726ecc017fda3b353d4ad622a70ec9f83619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5473f4aef3f6721ce8ab7bf1ae20988a4062f326fb3793abf10d4ff4430d50c2"; + sha256 = "e27e70b708c64b05b6ebdb68f38a95d3e06264c56fe3d749fb603473eeb12626"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9c449a468edfb9e98c2b94fe0c6729317f0a2e7b9e2fc9ac6fe508f9dc9ba2e2"; + sha256 = "3976fe366481f3dce7a3f42fbd49925e7988de58a869d0d96bfe7c61cc27b4b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-x86_64/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1da792e45fd577b7ea2e9d4defdbf45c2ce7b0a1577e89e5805489a14ffeb180"; + sha256 = "f8cd9cae21b27fea5bd04b6a54ee1152d729bc525a565fb97083039ee1244888"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f8a2c573dd5ac235cf1ad946b1f74fd373c0ba66ff3a1c9adc78dfae874cf2fc"; + sha256 = "189c4cf298bc5b3b21bf5ae0ee2b14d8a5bcf998fd79c27a943b6a146402c2dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4e72dd27baf3b17573f6a3d4e9a9c905679c398ffe4a54e9564b1bec9a1d2557"; + sha256 = "d125ed28dc6fd22bfbfd98654f0e2dba72fe54849191ebbb6cb315ee36b68e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "3da409c0aefb795a566ee2e642d5c8e6a27ab5189d5e37a0c66716acbd63d0a8"; + sha256 = "1e9f50533c2da8db6e802b1941a2ceccf58cfb38be1b139a04ac559e0195e9b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9fcbddaf46354b670c28d12623ab6a4d6381475d2cf2ac4bfa6729d0d3880925"; + sha256 = "62cf1879e3d009224cb9170bab531a8972aa897ac4707f6b343ec1d1e946df6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bd4024a7c6df02a18bbe4295851fedb70d2704a1b5528ec45788fb1b40684b7a"; + sha256 = "c58bedfb24b1b0be407abdaba951d0d4da01213d28c16edd34a84518e25c9d0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4714ab9a89fcd76be3da2f9c338540c668fb3b40fc5dba28eb052ab7f93cedf6"; + sha256 = "a3a7aef57ea6292ebf8d571cfeae66b11904ce2f2da8e36d27ce0c37c5c76230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d2f00109179d42b53eb3f8efb18ff4e6c81c6035fb3e4d39f763d39cf5feeae4"; + sha256 = "5d8ee5fe352cc927d4afb25f961beb104e1ad9877935688c963abe9e0722878d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "250ede13a919bb9b144f3e89ddf188bb6319d220179e7e214fcc3481aced6262"; + sha256 = "148be65e21de5278a4cf1421b738f3565411a6a579814b44dc092dacf0c9535b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "442903bd530fc6d79e46b8e10230b9714a107a0daa504a28e824faf333f9e9aa"; + sha256 = "b98edc55987560c4a688b15a0a069a9a7b74d06f42fd0b2d508955ec34feb256"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f02ba733155aa236391bea00252fab451a9885eeb098883f3965bda2c229bf46"; + sha256 = "aa16a1285b84b6fef8e82fd080ee08e40a2b388f4a09fbbd7036ce0dafb554a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "67d96433b68a9ef9255be578c1191795d22c295ce76f2f9663460b2b9154f692"; + sha256 = "099175325b5179d10569a223bc6a35688199d0f768975fb96d6eda90be270e4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "37e5b6825a7a39b7e486c955ccf2d2428a4683c1831bd3ff49742b3c89161a93"; + sha256 = "d00fdac2c05496cc882afb6a8de72f7a3a72b03748893d246cd46582395cc294"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d423663fd8534f8d77dcc704019a95b252e42495df298827ebbd4512daada3cd"; + sha256 = "012d9ae56fac6fe05d4260bc3082b7756723eb1c391cce30823641efd5cf29b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "792a0b4140247309e8d0f49138e8c0409732f1105cfec6ff18f462f83f0b4b6b"; + sha256 = "99f7572cf452dee212a016bf401fdaff745ef788351a55e98962e25bd6e6f6e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b750be8197847fa5a1a5051a5a1d4d8ccb0edfbb3713810464207b459c83ddc4"; + sha256 = "e860e3d87d8973abdff51ed867b3d760a7b6308c6c0f83b117200217617e076e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "14f198e8003cea2a3acb4bf51d724f87dc0524e58152ce1c5f1be70ac456e73c"; + sha256 = "277685c88c1d7a07a70b09c91254b788bd2c5faf9ae1880b91e9245535c46644"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "bf37f4a9e58d4f9f221cdd3d1d2b8b6f89793f058a5561b02df2a3d0d0295906"; + sha256 = "dda987d22ccd29156a66bfc72b156213f033d73e066fbb7b0f8c19d1d4ed7e93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0b17f45941135765ab3dbf4c5eb75f8f76ef006ec6f80f95a410bb54ba83d9c7"; + sha256 = "826de1a5bfd119b8531ca985767626ac8f2f485e71a597b4d0ba847fe335d6a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "781f06b8cf136114639c5f7d39be8033ab0dcf700a8bda59e58337b17e5a7667"; + sha256 = "9899a41d404f19bede698ac516f4c3a43fa0b5117952c57696ff4908ede3eb5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "13fb05fa4115d97d44e401350232c8856f89947a771aed3def2a2105e246d1ea"; + sha256 = "468a23fcb99b47e6fc6080fb8fbaf252f33d193a029f78f084522cf3a32de594"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fecc32f4a98c31f7f6ae032f55c3ef1649b041245d7c49c1d1f5462047b9e671"; + sha256 = "594340e9073e059d56d659adc54a19722d563f3e63774a46cc5c3d1a194c75ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "bc97613b91bda81c2ed9ef92e4e444f5dfe2c16c9a163bed189c1110cd54abae"; + sha256 = "4d1dc94a96f133092055fe621b839516d8f54c02ed6b47107b0459d8412fa3eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6fd69d37c09596fd74c5650ece23a4661cb0870b80d70408100475702ad6e907"; + sha256 = "ffa00c617bd97ec8ecd11167084afa986eff02c1d45501e89f0a44364196acdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "13241efce96508e23c858a64fec98c2445d5aebf9944fc320b8b06dbdb8fd731"; + sha256 = "9749a159e16630fcf885adb5ae54bd12a0cf03f4b628eded68636ce85690fecb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c3ac01537dd38d6c66519d0c97e38fc1a2fca07bf664ee5f5d2195bd39188335"; + sha256 = "703bf9158f3591f4b64899e1720dc62a8b007f4c1dd3d7c79f45ddfde696ee21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "420e42a239f73f37ca3ea30b230c4bfcd554c0581d7ddf44dca80fcbca6f0750"; + sha256 = "47be86544f11e1e6eb21b611e7f8517d0b7bdab6d2d36fe082c47a6e933468b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "73b0f24cd5eb814084982544e5539ee612b4b37ce1e1bf7fafaf22c169e9b5e2"; + sha256 = "362f3e884232c66d071747c3c024befafa04dc8e692540a1ea7c652145a7bce9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b97b8097536f728e7a30dec8d39676ba4a0496f880f9c918cebe38a782ffafbe"; + sha256 = "1c464e95bfcb23a36200d36869efb17c13af2024f4eaf6b698eec3659490579b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "53382143432869d6db33003c43610325bd6dd0bbd7ba9a508d1356d10fe3169d"; + sha256 = "caedb1c032b56a89f96429d1f4be58abf9b70dfa0f1eb18aa2a9e3ae8d04cbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3c8667c07918a0bdcea9c44e847cadbc1e06defaa43465dc6fc3158bfa8de9e8"; + sha256 = "a7c1427c61d676b4984bd6cf946125f7ea9f95150a0e44214a014c2a40e84925"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d0f63ba4c199e15b8849d40379095db58f9fe2a0ff33133cb1b5244cd991162c"; + sha256 = "2aeceb6dc9b404a95dc11a36975ac8cd2d79e4ee8bdb67299a84fe102b436f74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e4741fe190ad923d6b24ad2a9bf81fe6c7d924fe1b3bfe09657fd5ff6d7ac962"; + sha256 = "fb6ff671b9ad5c188e44e817d7c52407ce53f21a589b3c4a2bebe2e3a5cfc2d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "62cb5d82d0308ed53346c359d61a5f90b48c50eefd6b6714cbf1a8e18c125f52"; + sha256 = "c17b7a357e2fc51b826317201c3d8e8dc7625db213e5c67baa80a4c9528d1b76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8594efd78d16d09c7890d9bef7b121529564308f1341abe27db5b35a4e7d3ede"; + sha256 = "de91b909c0eb79f0997c6ec6a5b9c44f0bb029ca0b10dd347ce3119bea20540b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "2a116470fac9ac157854a63b30515b991eebccc0ca3f3fe74f56be11953d4e2c"; + sha256 = "d73b50eb034ca034a2059b5e5d998c4e0358f8eaab3a7ace0f8242d3a3824493"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ddf0b9ef209964345cd9cdbaae621cc1f85dc5fef11143878f2bc285155e031b"; + sha256 = "b75dec3610e738b172202c689b7bdf11e3e71761caa765f89559679472fb91f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2202504c37efeeb7311baa9841dbf49b50040fb6952fa7b4fa24d925d765f045"; + sha256 = "fa95c04156d2763f213018dce25f0dafe226a1fb11a9c7b238e206f0169f6747"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cc09d2ecbe1eb69fedd6a76e5163a6958a4d6103a8fd496f86cc2b9f20367431"; + sha256 = "41d7f8a03bd0d93fc8372a2688d7b797cdbb0147815a5923b0e420a65d1863f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7e394917b96e393b83f5b1f9fe86ab1d3ecfa9c98dcfa1762c7f86c252911381"; + sha256 = "6662d829a07d6c327c954f86b7c174398d39061e10336f217a805df4680c2b62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ad4580e388ce2303ac54151d65913fd837259f428424c351871936f6453f043f"; + sha256 = "6a382d9f1aa39061b7ca1977a907791a044b9e4adb7d0058bd6602b450168348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f0c5a2c03a58bc6c3489d7e77413052e2d3f5946ca9de0cb9447675ba9ef2b0e"; + sha256 = "546e832b5578beb46cbb53fad43fb15abede650370edd122952e8652fb5042f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c552bf9168c406be1b3d98f2db782fce7ab38dadb5421cbe1d3655da3e746e10"; + sha256 = "a74e231ae7f554278b74a59e58d56beb5f4cd6d9d6aec30f27c2a47f42868237"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d6cb09990428c58e1cfcdf96ea578b82acd8d811b1b422bc52a064bb4d764772"; + sha256 = "cdadb68af57477315bee3015115fa550ae1f3479a5b067987f67a0d6ab7cbc10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9494c3fd3c1fb82aa728ae2b5168a24419539559876a8e4133fe25084e145808"; + sha256 = "725af00249d030946d635f0c5841e947f574bacd8cd63cc51b41970424f46d65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8f6de4c0aa9e0954501f1aaa9c536442f858c725e53a960630d41a4e69632388"; + sha256 = "64ecb93a0d0869279b6d048f84907ed8cc97fc3460444835cfe6241ff6d4499d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "eeab0f343c631ae4ce59c72f420ba405227262c8e4a3c310d155cf72d21b6623"; + sha256 = "93d0c1b9d29c9c1f2538b9ea6f7138f9155432fef3963fe2f0a888947a956415"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4bb6cd84a5762dbf1916314afd7379b0fbd61fe432a333a33843a54c7a37c43d"; + sha256 = "4f126a761ecb8cf90b159085afb90752f516a0fa17018364b3bd74246c13c748"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a1616aeb135b63aecded8290397ced2b9ea72a801ad8f498dbb2f59590cb6105"; + sha256 = "36d7b19594b12622aed7a246b4478fdeae82edc387bd61c613f969e09a9c9448"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8553daf4ad1471462c14ff7c1186e57f6ddae5170f9254c68ab89903edbbf14b"; + sha256 = "377f87e02358e496f3f8652f7343b4d5a2b41b2a0a62a2cb4150bb87eecd2605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "353cbe93c7c55ce8d59784b12ce96c904802bcbb9bbf6d8c68ef57d7f635179a"; + sha256 = "42b9973e2453635f609d08f2fa61d4201db1d0ed220d536f7b07ecd62a8e89ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0b7778b4ecc966cd3e010996e250434350d1899be0657df6ee759780f80f1fce"; + sha256 = "a2a3615fe3ff217e01b0624081c2c4a331977b5bd827762db42d5dc7aa29473b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d7906877c1ce9c6ef47de911b870e067d27b5c83b52771ae7c6052fb437caba7"; + sha256 = "85b5013dc94f8fddd96c65d33cf358e00be0af5edc3ca7e2f5488c18f0306203"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "23fa3ec7f1a472563a5b98943dbc576e24020480a6f5e6d862125e2c496c6f72"; + sha256 = "f93a665c7e6ca686aec843e4d2c25e88adfe44acd549923b0423851ca727203a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2ba938b86472dc92704a2791c33aae2386d3a56ba0e027ec0828238752e29823"; + sha256 = "1d614936fd91b53718a8f538bbc3728245f2ca57cfb59b476468a9181ffd5868"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9ddaceda06c199fffab52fcf1e04dc7a509d68dd27434fb5ea23cc521ddfd6d6"; + sha256 = "894752608f06b01a105c480e6a884a08eb8d5519d5d4eb95c906aeb76bf3aa39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "29797113978960543d6204be64d1f388acc270b6048416d8ef7bf1247ca9f4d6"; + sha256 = "91ee3ed34cf51fe0f21533ce85c9df8af6a811a2128b27897869a8b166ecd7be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "ae7b2f0d4502bbf38afa3011e7c068cf163ef49778b16c219ce43b0b65475b59"; + sha256 = "a9dcc8548d786319bb0158ac8002b9afbfaeeafbbd0f727ef481d3769e11745f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3e63fc3c854a7c52c6d4710e5d5ba34cd3aa74d88c640c425656522dd1f1ed33"; + sha256 = "261dd39b2d29f35b517fea14ca1c1859166a9ab9350b051e61b0f87b6471f8e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "afbf87dce72ea5deecf254b5c3ea2a76d683bc10df9490c0b5d9cb093f1d744a"; + sha256 = "c3d034674c804e21e05fd3a928f237fc311bd29c741f1762e59e8f335de7587d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4713af9649c2327827c95d67a6b1d9bf7586109047572a585f605e0abf126aba"; + sha256 = "5d4cd4689ffc4679eb6bdea0209aeb6cc74ab246e6345abe361b31a09f76a758"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bb30dbfc7ca1dcf5aa6e7e087e26114fa99b756af2814859ac40f8622a7fd8f2"; + sha256 = "4824f4f413713c4b80749c6218cc524be59fac57b96100229f9dd643f6dc6420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "2efb34ec434a8e761b8af548cb08d1daec95dbcee7b18febbd4574f44991e2d9"; + sha256 = "2f64c8d6bb0ae6bedc35b9a6da0757708cf3588c43b74cfb699e7d066061d754"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "4854311c9c6097b851fd48208ebd2e3bf8d9edd5176cd8d59d7f6aafb1a58f3b"; + sha256 = "0e313fbf71be605309305e7e1417d1a5dffcb90db71448f6ae9796cd4481bb23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5baf7f6d41688e67d39d8fe58b418622ed45847b8bdec140b208835de92b192d"; + sha256 = "d88900829c3c56965f487d191c59880b4d8db1c2158c2a42345c8488ce9e756b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c537f45f4d3312fd84820781876f7057f15b729a2acc41cc9cb944b349a8ab77"; + sha256 = "68bb81e1d0f7b28349c21b9f3ef1767c0a16f6867c25c4eb9fab92e83bb009f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b3efe2b45e40c8c19c71a391bd56d8217ecebb306e248d1bd605b9453e595d0d"; + sha256 = "907b2800d6c0f9d6c42afc1d39012bf08f91475225a87bf34ab399468d415430"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9e1834577beee58f4154a31490de01af4841f589b1c99f1bd988a3997cfaf158"; + sha256 = "922f321fd5d07207b96dd7f5aa2589b9ec2f0e15a7279722a5f3955333fa9618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "242e6cbee2e452771c96196e777c3f3e6ea3b23d0bcf7400f9902ce9d414452a"; + sha256 = "0366df618f6f90ba6e31f6d6765105eea4fe0a659ee7b9aba620556488dfb5d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "578f1a856c800849ff763a78a14d86916f5a5a22b02971476b5117bd3a30fc67"; + sha256 = "2497ba133e392efa3fdc87d7b57001161265486101fb50b516335a9c4929cd2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "d1136d8e646d7cfa6ea711a879182591d00f7e378abde95889aa0429fca2778f"; + sha256 = "c31950477111b72db49542f6f4d9a29a2642c62dd6e34b3c8673b4598aac3fa3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8fba9a351dc1f2133fc3816ff13e2d479044a256e1ef0d61ab5df538591fef40"; + sha256 = "bccfcb28c3041d9a729130655b60db18ca5c095e969b3f7e534a81aa512be095"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f24a14ee3bff011451c826e1871d811a4c9411f3766202037d1f8fcba7ffc9f5"; + sha256 = "62eb9a87d538acff99abd4fc48c67c82301e28d31cd22570f686e027889f2157"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6348659cce711a9165fb446d4415f04ba5d46a3e4dc27ee0525563ac69e50911"; + sha256 = "eb2f241dfc048de3dcc3f0c78644c9a7fff3204a80328e6ff4c8ffcd5c1b8fc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d1be462007667a55c921ffa8398e5438d5c0733fb922af38908af65ca5607518"; + sha256 = "6d1cbbc5156669f6a8b2c716667c180093709bf2c9b719b10b367e1a35053a5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cb2a394f10be16b13510a6966d6566d0bb0f2b484998158f4988de5881238ef6"; + sha256 = "5d2bdfc8684cb85b738ea2cb12a5e37f111989724a64519c372d2d4c84b05ebe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "098fd826d39afb9775c2750df009bce9559f87650321b8c065f4a476f11ca42b"; + sha256 = "9aa8fa19894cce2203f703f519652e60efd643bce8e3d9e9dce4f44d4af3df90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9b6a8f7f3a5ddc798b86104c313b9551ee58e457a13c51a4e7df6d0633d2e8ba"; + sha256 = "3edbbbce178af3b9e5583eb9b57e1c946fcfa844a9675da2dc69dca98b51c959"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "c2ed020a41c8910fb26070268e467cfaab7669641111b377cad8045f3aa58900"; + sha256 = "72182590b349bc1460aed8fcd262e755b8dda7b4f789af9bbf65ba3b9e0e4b21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "4a23815d4e31200e862b4c6aa88782963f042639df71064d1c8304a4175edc48"; + sha256 = "03b1675157ba9becd866825e58abb58831171f12cd724fc222285e758f093c61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2fd5d51abc2060c99611ce87e3c701fa34553c18682907f16edd132ec343b89f"; + sha256 = "0fd528ce2d1f4b7f87f225fa76ca29b32500a5d66d61858c238bb89a26784cf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5f5ffef49964f0f2d2d84b5c8a76489b9d41c6d6016005b83801888d091e3459"; + sha256 = "68b492fc89fa8b33a1db3e514feeaaa6083290b47bb6b0a6b2d24018a9dfa8f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5478466d9f5561ffb7c0a9cc7da1eb38380fc72a59490582c5bca9825e00dfb6"; + sha256 = "c0b5c0f615220d7e746bc0a3236233430086cc120efbd1a8afca433ad1cbc63d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "6bef1c97ec3f1ceb9b8bc53acd208af905c8c3b7d7178404097d56c98ba76d77"; + sha256 = "b3cf7e8ef07ba0d69712ad8942d4939e0242dee69602a84989b3837a3e212446"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4be7246171e5341c348f22b2f787e470c77435353874097b59848893ad30b609"; + sha256 = "0ebf301475b58549e3e9e696adf1508c39132236d26a1ac8eba9227de45347db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "eb88c2d2abbcbf2f4b2ca3eddcc5b6e04de8ec62f0d7eca429f355c9945d2d35"; + sha256 = "4fcda91a507b2067e76b6ea5a3e923c6cb0d62ec8d31c657b0503a85b907cac0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c925a98210ed9f4195fea56fbc191c5ef7b87e7306c57538c087f92c331a4765"; + sha256 = "3888236e063a6a724f751275ad714fd96d65b18cd1ace8242a7577c0ecd27f42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "0eeb92fd2d5c0dba6f770a013bcefa89f09c1984d739d356dd6acaf8a487cf4f"; + sha256 = "35ee32850af101c1e762e3a04ae17a6c2f33c58bd0aef0fcfcce151a6f34bbe2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "749158144a92a34b4f21e97c339bff01560e7ce346483ee6fe8c07c1b42cf10a"; + sha256 = "0c7c5bb2edbb8f0ff72eccf07c01ac078e1d9b92da8ea6789a2c8abe4e78e93b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "5d8b034cacf4629b85d977d8cd858dece48055c9f7e7f3c3fdd995bb0cc619d5"; + sha256 = "2924c50d23472134428b699bcb4fc3714a90ff54820fd58fbd46ea55fbefde79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3b3708ba6ad65cd0e3bdbe76cb6976a6782376370c4da3ad94c7817bb82b91df"; + sha256 = "454b7dc139d407e95b94d4fc5fcb0d298501dddfd6d8d78416668e4d3e606eb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "858e451b92da437a93a89b3d512437177b90ca118f9c1bdd84948d3ae1063b71"; + sha256 = "e0bc922e34eeedc64e11da87308982a79645d0df10f9bbabbe5ae256123d8b57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "56708c84f1784a85e27967b3eed74774730d9673ba4235376328dc09602ae007"; + sha256 = "475559c6e4c119f9aecfa92d44323d22e986704565bdc6e929536a025ab026fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "12f1e435827663e7e855db5fca9f829e0b9ba21ef1a7c3dda343900feaae0350"; + sha256 = "c6c0a5073220c1b93a869ff5abdef09fb87b234842c13940c233e3ae73233057"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "815df93bb5d9bfb1c96a902e02b860f239705426c57a30fb23e87a2c991f4f92"; + sha256 = "c328c8f053ed31da91384eedd0f7f8d16fa182adf15ed92941b0cfeceb7b610e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "dde6d679e2e8281ded4ce724e48ab9173a1ced0989e0cba579a29a92a0d93f01"; + sha256 = "40509f9119928a59d273e34c2e090f916ca8ce48cd0c07d49305235487b924ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "04d725359e36da7f8cedd8aec85f5ce153c36d4c0065caa8ea26998369df5434"; + sha256 = "b7521924ade0a2e62ebc0a3d22b84f69dcfb9c217d65ce289de800bd258c8c0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "6775475a9b4e504677cf37e63d2fffd120793892e394eb810716e55f8cb01b09"; + sha256 = "f15d5c4a631aa0b76fa43790105caa5cf7fcbcc501dcd11e7160b9ac4d68519a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "cd35d192d1a3c87d7398cbb82b916f87ab333518b9926edc0ade07fe2e37d2e4"; + sha256 = "a429006b7f8112425e959f26ec1d80a0e9583b33fde9201eb7ac34af108d4a6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "298d1cc89d3fb4bc5f351551a1117e3316f89aa3ef12b92ccd55bcc11d5aeb72"; + sha256 = "73371c4d0d2a90e9e7eb7fb6a8b678ae5403babc04b48c783dc755d22aa2692f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "bafe1dd38b2bc88cf6100aa4fcb96e174271bc5599468e3519ef79d1d0b0c5d3"; + sha256 = "d6b483d269de8b29c8531a2180203765b06d8327bf4fc03a1b4f1388e6e090bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "9fcdb11645deb89d7e9c13b2a10337005ab972263e4634c7ec0e9c16caebed5e"; + sha256 = "a3356b334119bcb5510ae065def9639dc5edc70691e6418f4bb54dbd14f369ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "aa896e7433b6be800b3ae0c7b9093b5e5dd45ee75d93b5401ebabeaf2284d194"; + sha256 = "76efdf2ece93286022cbeed82d2a0ea871c000c43175c7e2b1f4ea2d424ac72c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b6/linux-i686/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5dbccf5b5ca17430f8dffb80fdbf572f66d916e86a91be335484da5e2e9e66c5"; + sha256 = "bc3db9fd0958bf3497c3955ece9c82972429112a6f497dfa6587bf0d33c7e0ed"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 46da04102bce..45ad155ce351 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1035 +1,1035 @@ { - version = "132.0b6"; + version = "132.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5a1691bb3359b1a2b8b80cc7653f1c236a29878c90ac16910a7eefabeb597267"; + sha256 = "1f39caa65b32ee1cc42747e1fdd6e0bfdc7a306c5ab4e067d6170522eda281d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9a05fac63ce6ec8b03a37fda416cf06d803eb7db208c8d17fbbfaca1bab37c87"; + sha256 = "87720c01424b68f0c1c6f200c4550fb8ee7aea8fec8f3bc54f1dea9d97d9a443"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d34fd5349dc517a4cf049760a8b33ca899aa7c2d12895f1321481b9974fd32a9"; + sha256 = "210408dd6c738553ed32f1bda08b7ebc2534358905d4c5900af24f81b73fea02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ac4a95f2c86ff79921a1a2dc6da9253152c7d12e15fcf63af3963045a364c82e"; + sha256 = "072f4f032af9998c6b495c9517c6b008188be71171db4a4610a99e28a64ff212"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "362cd6a3842cc8b345ed3abf5bfe62f6d1c5391831a5d8f957285d9df6c9df87"; + sha256 = "5918a67ff82170cd46dc384eb6558f096fe269111997fcf0815a057943e2b84c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b4e15b48981aa2c506cba07b34ffdeed74667909577ce5e856c347bea4544ace"; + sha256 = "9ec5f80f4a2f779e6cac79c51664afd8f8fd52615fe0f275108955c43869e76b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1bf2b7b8fb2bc69ccb74cfb5bc95b5ecb34575bfcf0eb5e0f33cd8ee08150966"; + sha256 = "841e1b0e7d8b57fe4652df1dd6df75bdd92e08facdee5dac3d19018086541257"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "09d6aff0101b8236e8c1c2377235e49756c66c8dfa0c30ba68e18f669c57087d"; + sha256 = "d188f99f3cc7d434f83b4f6c2cc061ce5ccce34e5d0f5417ff598f818402e3c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "828e196c1fc32469cf8133d497f106e45fcd1192c30e7572a2cc0a8c00d54d91"; + sha256 = "88aad5c943bdf59f84231b3cdef43ed58cd7bf4657e4cac4d7e17ea826277709"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e2e50c4f9128d98bf225c881d675d683ac835ee0592dae6037885377ea461784"; + sha256 = "1165d36af18c63adbebd849f8f7e5f60904eb4a12720a64294dfc7ed8ae949f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d3869620429f625c3b4f4434577e3baefb0b8ba4e32beac233d62ed81cfe26d7"; + sha256 = "d76e76da3c393a98189cb91d03e946a0a75b47d9a071e645321d2cd003dc6dd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "13c48a8410c63d62716df42ec220f99eec130601cf571206e88c676b9e8a8b1c"; + sha256 = "1bf2fbffa615caaf148413ddab98ba33bcfcbdc1c4977a79e74bea306c48ce8c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6c8760d78d10422fa00999dc63aeb72d53e8a7bb240413e0de41a40e5530bd36"; + sha256 = "6f88889713b16a5efaf5c4cab1f4c18d44f847939d535115e5532f52af04d130"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6b0a1d1aaea22dd14417e1770bad90357c08eeb9806239cf2c86a04f03583627"; + sha256 = "193548816c4d771513e85aa5922d19b17b9b11409f5f2e619802f57992bbbf5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f615ad4ff6f850f70c472c4f4e4ae5318a8cf59b35b2bab570984259b733e337"; + sha256 = "d4174d7cfb015cd4d50efe60abfab4d94311f1c063f28b4791a483c07933ca10"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "02afaf8b5c7afc3285dc839ec707ced38aaeab837fc6a9915588fb13a080c754"; + sha256 = "ffc4d3f186e40e0cabc1950e60c61500491838d26a17dbc254c264112f77b69c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7b33411be89aab6e70a99194e6fdd5c065622a0b979e444c8ae75bcc226e6d09"; + sha256 = "d2fa4c6f2ece1ca73a9b8dec8d3fe8b5bdfe9e43a57390a20114b2af24ac1729"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5d5be57ecc4034752dca028b6efc1c2a3dbed34f484dab70b7a27ee19831e840"; + sha256 = "fc6ae3275ab21a0903d958b31df8ccb016f109ebad3ab4856d43dd9cf4a5295e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bfbfba6bd01ec42bdcf2766fe8f3742fcb71122eba6eddf8509a3348221072b7"; + sha256 = "5fac9d445c67e19aad732f3e8ee65bbfab452b40585bf3df04a7448914cac59d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2ef74d15c9b0d324daf6d10cd3af1f06b05cc9553ce1d5bd54affe5243422bfa"; + sha256 = "b11a214087f8c73a973c88241616f3eb4e1eec1276476dd2b8a7d3677a386b5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c893b17e245970ef90b0ed94652c20592f0646c310c29e5dd20e1ea54f4ffde9"; + sha256 = "564f4a4d8fba9aa26e36ee8a9d01f1dd8ccbfbd4af4e1f465704a70f44ea65c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d5f58729e0ea01086fb4c6f2de537a1fe6b7c02fba85ddea7418a58cacf837fa"; + sha256 = "ce6c0c613868cfabf505edee1b7fd6835e1d8aedbafbbe0e4628ca74679db7ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "62b4f75cec409b2afb909009c4b278f8d18b2c467735a95d4cd983dde4b0d9b4"; + sha256 = "ad1415d623d08acf32a6a891f4c161a576eda25fca64443ac84b366769b4fec1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "2226b0a6742757c08420bd2225abec0840e1f68e590bd0fee593c493b4010119"; + sha256 = "9ba1d43f5899c4eaf9c01da2032cf77bf21918d93c6cd9e89721a84ec20c497d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b2b73bd3763707f267009511716d5903b9e91714c680743b51d3b9ea3b9c21bf"; + sha256 = "0c1ecef4dd5c824e766c715f9112b7f848341193dbb26548459ea9816878c6bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "620027fbdf95cc3dad730a8c1a23ca0edfa9d189ef2b46a1c0ddc219d066a2aa"; + sha256 = "70f07e829e31228793a36cdd71324b8d1e4e7a6da9830338c6d2520af2fe1864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ec7380befe2f9f210eda51e39eb1c35fb20bc80f791b9a2a3b972b1668f9dae0"; + sha256 = "65b78e48e9aa307e8e9d77640ad1a3332393ceec40422bd7da104200deea61ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "4b978cc773072a4fc16908aa586a234d6294c4300e4d73d43e7af1497547514b"; + sha256 = "3a42bfb73b33f0eb5a05b166dfa4032d34c4ac0a7470d85bff6c3a02474d702f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5945594d5755d912ac26967ebe74edd84ddc3ed986148fb725875ec20cab03cf"; + sha256 = "5c11d5679515a2c459ef9e2092cb1a7272a2592f61e082c9da2b856bc6455392"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "71776da8c5fda5e104cafebbaf6a5b57dee1fb8b3908005592e06b71564c8aca"; + sha256 = "e5dd46e8f7acadb4b2167b9f123bf8415d97943ccbf837ba62b0ecc19775df62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7b1096903c176f9cca74b27437bb87ad6d479d7e494553f14aa8d3dad724f853"; + sha256 = "732a5a1d28e388393109ca1395f5ac0214a51d736f778e769b6f1c81b63ea800"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "dbe22722065c1f7a13b003290c6de00f69835966a8cf51b3cbb4effad8aab3d0"; + sha256 = "b3cbf42d087663b1c9f81eb42b1ddc649995fe212208e752d6c346638693392d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4235fe2e940396efa7fc28e74065e9fe11295e94329c096de1976020bee8d75a"; + sha256 = "06f02bbbc6f3799c7473a2113076f949704ec30025235d76416cd228b18dd4bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f5742e76561ef0046dd92f83f4459d8064798221513fe546603a50246ef06a23"; + sha256 = "09d3fd010b55e7732624beacd56b5bb5bb4b7b7cbcaf99078b31477e0c042edb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "03daa72497607f4dc8f2b30bd0050ea5703bdd75832c540ccda17946f84ac6da"; + sha256 = "da4fda907872e126ead94f96b1dd57f106855eb7ad394a265ffeeaabe04dfc2f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0fee04713d82b4b848f7a39c92fc1919de493c628abfd0f72159f0158ba96280"; + sha256 = "0794e5be4c6e3b12f0a60d90faeee861093f46030fced53dedd1c0edb1ccc28b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "97ac58075af93d2fc12834d3a8de21f6fae27e9249bae42cccd62d1f753bed30"; + sha256 = "f0590e9a1f22b8b801c9f302f2c02bea6214ab679300eb3961b4f965c8db55b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "abd1fd086fd93c51dc1786b052d5262c9adaf66c1d8f12efa02a72955aaadae7"; + sha256 = "dfd233907dc1d4a67a9e6b93183b570f759adfee4903f1b44d010dd0a689afef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b013a59b70a05b32eece94ff92416a25bea022823a0b44ee6cc49a9d7131ec8b"; + sha256 = "6934b32cafd86716039827eacf5509f7d3a59657ade55fa342684c197b95fd0d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "10c1e93056e3ca2799389615c556632277638abb897fad39c257d2ade8ba8b59"; + sha256 = "f04e6d704828a86227a81e5e830570ace80ef1534a646e90c89aab068ad8fa45"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "36b2c08eec456f1d80523fd6d64639d0e9a7db80d9cc324ed7c7af738ece3dbc"; + sha256 = "98976288478afbad1df8f9b230e6008b07e93e5c895cf78f3e5d95919998b123"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "159d9e8c6871c78c136da9c7039c2c206c41c729ca837284b35d012d632446d5"; + sha256 = "8863e64f00c277ab35e04d364e784f844ee4bf524ebbafa472e70b16aca123b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "397695812c21d165d9bfc2a272431484b31597f863cb4ed0fee8c74ccaa6e1fb"; + sha256 = "97fbade4177031acaa3f2db7f3674aba5a4c523872606295e2b178242460cdad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7a52bb6b979508d48223a61d09152c59d29b183164706f9aebd05edeb1958961"; + sha256 = "5cd45fc25e4c9f6dfb85e0ad6fc9cc4b61ea76dc4ac3ab2c81e1628c7cb6d901"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "34dbce294c7b4572a9421bc2850dfe0217924f30e4ab7496ba2117782817555c"; + sha256 = "31588cd5fda9eb3016e65ea2373dc1ca8d8bc1ab76a39e3ec805b24d017e4f11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "de221fbc6c1a1787161282fef3972e7c43e32fc42d1544d79207bfcba279a685"; + sha256 = "222b21e3d732de1133fee305c46b62b3234efcdcae3798cbc0a74aced1922067"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "40ca8676c7df07ece83999693fa40288d5125507312a75e012ad14fdaf47a5e7"; + sha256 = "80980c0db12255f09e755210f8ec71c7e9439ef1745fbe8d281b8b0ce5c65444"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "adc3c8fb811605c1fa67173cfa65e4710a30f18b77734239f346eccbe84283e1"; + sha256 = "fcca230e6285991a8b469540e6a819cda8b9b769d9d98f3ec40241b377dc6953"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "98039d5decb131bd0a5ca5b5fd7f439762ddea001d72ad96dcb548057e010262"; + sha256 = "63350866ecc7ad6f902f22945d8de6c5b2b5b73a1c90ceceb16221ee0e1d2864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "602632d386e5a1db4eae14341d372b6306e4a47ede9c31feb9d798884f198389"; + sha256 = "b25a150e4de973c77a935635e2b45d34c476c766cda415d3cfc059265b4714fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "257a39b133b11ac93ca854147ffc33dbfd1106a3ec6d84d9ebcc778800a05dff"; + sha256 = "74e94928ef4e49c5dc5ad49e56adf5fd958b362192c711c8405b63cde43138b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4b6fe5fd644a0e51c1e17febd0c04dd7520c1cf0cc1077163313b9f380b4ff5a"; + sha256 = "0f26bef2bc97755c82b4ff38480c5763fab1764cad82f398ed8accc4a755aa71"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e257ba9c4aa57a743bd5e2d6522d211ad608bad7a1306d7f41b1c7c3376926b5"; + sha256 = "efa10add7c6198d2709e0943ec52675cbd98931c8ba6a2b03240210e367bbc26"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e5e260ac7d309fe9dc17345c5abb20e820b7ee6942eea003115ca479452436bf"; + sha256 = "c6189ae86a6c502c0e6ec5a1110cae5fb49377eaa3a3d72740661090731d900d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cf4e3470faa67eedf66e74f71cdf7384f3d70dd54ff2ce9618d5a3e93b426ec3"; + sha256 = "91a9ea6a270bcf43f05eee0d45c7b1247dc6bb1ceb5390726f9b582cca91e0f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "691de79c92a0bfcafda9a5cbfab41cd8b550f2b194fe383018e2f4d8ea5d019e"; + sha256 = "3ae6ad9c2a34deba6067fadde0afcaac784030c839729ed2449784350a713223"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4a637e1810e714b1612453ce9b17413e4dabea2749ef44cbdbc0b9e0bbf54250"; + sha256 = "e3b221495a989ffeb3dd6352c29519764554f8e06591b2cebf70039c2f4c7fa0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "108e0d8f0a776628d3dddad21eafca8ce9a081e6138d08ad3cb05eef49f1a6d1"; + sha256 = "13302a48b65fcd0feb9719199f5f997737e7458c06cad6d098c1838fbab2904b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7bd6fbe3a24dc27f27222fa7cf304429e59e95e3be018e16ace731cceca4552f"; + sha256 = "2c94a010840d08035a7f11e40d7f1a92e805aa70e6348b1802b7e1dac3d78307"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cf49aca1c480746a7190d14299cc97425f391d46e02b62034d849278104454d5"; + sha256 = "e0e38869b9d299624623b0fcaadd5562b0a1c5f9ecd897348a495b48a969ceec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e8c34a49b97eee63712ed4aa7209fda04a0fafb55d6d9cf560e76c50b67befd9"; + sha256 = "964f17d9129fa6eb3a3ed6b30392aa5f4fa19708bdf0dc4f0c1a0db32df0310b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "52527e1d66823f8b6dd0f160bb659eab2652a0edae31cbb1326ffa59532a301e"; + sha256 = "9c95ddcf7099e8d88932d94431610b21ed24d33efddabdec47778f5e67351836"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "12f0da186b507d788767ca0e085fa894d3df3a07897246fed12516cf4ac72705"; + sha256 = "e4e4a887b1c2cba684ba2528c6cc471af3bb82d8d9a2fd1833930d915a2e16bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a86f277b73ce624a52c52cf63f3bf84c174befae09d45187ef3016493b616fb0"; + sha256 = "c73b6f01896873de4388f73e92fdcd0d04d7dd7816e7827b7a6aba5284aaa03f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6ddee9113b1d6360718decf4e500778da5a144a9f023850bd73b5a7520b4bf80"; + sha256 = "aaf0343a3e3c8cd9ba4b9e61b412381ddedc124a14646379904aeaf11ed4dd79"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a55a695613981f1748e08ee28aa7c17896ac1218cc3fa935e762941218ad2c60"; + sha256 = "4420332b3105bbc53dbbe1185a554e208e39ded5541eb7452add0f8b49e6655f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0cb9cee504d8aa9bd544f863af1f3806dbf1029f35e3eb7a29af949b34ba45a9"; + sha256 = "2936ac1de8e97ba8e393f687efd5bb3b358ee3c919b6fab7f20d04e46d11ac23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "dd7f2d94ba8576fd5099f4817958d078dff79cc6b4e39557f3fff26e8342a8e9"; + sha256 = "b3e46bd840beeae40cd3594626b86a849d31e30b416ec477fcd99ae98cbfd87e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a903679b24a1db6df01fcb1a01083ff63585e5e79adec5a91cbe27c69c71ba4f"; + sha256 = "19ebb27df8cd258410d953ed54a02281f33bdeb892060db9fc43bff81cb8d3fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "01b88e5d7d2d87b5e1c2d8a7c6a9f06e5b4d11162c9623876ec57b90820347dd"; + sha256 = "d4b24f8468891079e86136ad2ac99240faebf843672bb839cccf42203fb82a69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a0b653952b06c4fcee6dcb095f3738ddc9be9169d235d1c9ddee541ba5bfdad5"; + sha256 = "c534e8a87cec2f0e9ee0915bf74f3a3a268112ba2eae9907e2850a7e6e294fae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4b873b6f93db430eef7abcb2da88fb6a525bdaa3c7f2872cdfb8f420e1c52479"; + sha256 = "ee475ed9aa8c00d6dcf02f817cff43f689334d1c9f16f42ebf2b45e5f0812c0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "eb542b6da6754fe3885509ea8fd694189f9925a7ff50afd41a449177b9daa059"; + sha256 = "326df9dedadca13f46ae26b8bef8fe9127e0588f84d839214bf52ef013dc45ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "26f12d96589d5ba1371da217aad512fd3724e57c4088153b40b24ce60887824c"; + sha256 = "c222ff822a6433b216ad164a5d5985cbe046e220a5dd7f4f1e043531e07ef457"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4e5b2092831a070f2cddb0ed422e4b0af66719cf8780c2332c7b0b0f2121f07f"; + sha256 = "ec93394cefc1c458349a5b91527e4159e6958614b96d626e15c751bcf31dd780"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "05032c39093c377bd6c419525e291e049cadd54cbbe33d833ada6f8361f6ae02"; + sha256 = "ffe3ea9129d2aa1d998391965f5f7c58867226e750fe79282718550983d994ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "425aa0b2d60d26dc45c1eb5af753b02e540518b0fc683194f785845ba1b6d500"; + sha256 = "c3c68bf3cb48854238ea83e95db04006f099e378f5f073f93a460b61a3ca8298"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "8c7545cb5fa747f37f82b0dbbc65dae682c09c68b6e27803639d2002582f182b"; + sha256 = "f348f5400fd8f9f7272193824bf873b171cb01b3416e30d7697a0206439ad0e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ac7614e84c5affda5abdf64128e68e82437ccedcbd3474d6fdf5ce96309c8782"; + sha256 = "8cb3ca91aebaf60ba754bc2f3f9ef004a4b1fe2f96aa9699a651793929548fb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3398982406c71be6a4ac6ef4655c3bead6e542e1508d65e59eb2b7c3f8c8a5c6"; + sha256 = "7caa1d9b5167056e64407c87126796e9b2c3595fab890ccc8f600cf2d6ba3b82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4a1952b6f9b55bd11f6869b1cfe08367f5f1c7b40974b6518b59ed97a9728a36"; + sha256 = "0596297cc39de0580f5eff0e6bf11ad9eef58714964277df24afbf2266f78169"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bcfdc04f07d23d3dbf30e9f3909ca402baa366bed1d5426e23a409b56d0d7186"; + sha256 = "c232615c60808666cf7eb42390c957ace79fc2964539dc9d78337db2c82a8df8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "e192623c19c577737184417438d831dbf447f9d917d9d6deb1fbf04048b0df8a"; + sha256 = "ef5cd9a9677377fe3cacfc7234e3180c016fd0ae8809663966ca3f735b996efb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8238a41d7a19698c2ea20ab97977283d9dc084807a19e42dab90c74e8be3dad7"; + sha256 = "968357070418cb7175b438e0192f8eefb42e3fb7604df9bd08e1f060e7cd6ac3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e1f5077c5ecbfa4032957e29d9577377dd4408a644a9079a086dd879477d878a"; + sha256 = "44828102302c416f2cdc2858aecf843d72e0015a743a4a33a6e1256449c686b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3cdbd71fef15807ecf86f583e02277bfeb70a85536e9bba9492781305f9beaea"; + sha256 = "b1d849e2af49f7c9bf7c05870fb79ff6e0f9ee0fb58513987632847300235e53"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c2b2c0f954372b2d69ce7ec2a2c5a949902c45d1418be549b7b8e107e7d1d464"; + sha256 = "99cf9f0f9c853849a18d0dc05c2f8416c42884bbf92d8e046e835ae09b800f97"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "45ea5e64ff8e10598c78e837477691f049cb893a21270d40a3e8ebb6650248c7"; + sha256 = "664c2231fdde88b8d2e438429a699cf98c878f41625b89d6a5b14d2270e96fa0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "09662dfd9f3dc6d88c00e8d57738359b7679a869398f9d4491d0dcf3be1d9854"; + sha256 = "038477815c83f2566bf4c00cffd37ba0ed60383c90badeb685ac95bcd302d0bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "33fc4f9ee860528714672e0348d2918e2bf497b2cbc30b2f7cee508de1823247"; + sha256 = "3be063a9199cfcbb08a59e448c41b6382d5d13e998d6a3d4198f3bdfc389ceb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8d9a074d4c17b8b7c0ca9b504036c21ee20c471f6b41e02ec53c8e8e6adcd716"; + sha256 = "3a80f9b8916d2827e0ed0a7d6c4e968aba80c97e2d1a595b8a0c10f226849d16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "f2e43929d8bb5bb94e3ccdbf7aa4408adfd1fa1c680b7d6aed52f6df6cac9420"; + sha256 = "cb171a6f21afe5df09f41b11e68c6cb93bfe8c64f1c32e75ed248d8eb7fcc055"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5531272fe2865d652e813a12995280042c70f1bf210f3a4228f250c2cf71febf"; + sha256 = "60bf0863d527971f35fb903c2801c7b607d43d882ba4ff8be7d1da3ba7ef9cd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2aad34a224f7ec7cf86ce5cd0c48b0a3decc8ee5f302b05205e524ced93d2a59"; + sha256 = "16eb05f365b447a7535d12388d27e2d439d6dbffc44ffa1dab2319ad922738f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "cd46bd8ada1736f1f0a3e3338e53a7cff1717a5d0338daad480141865c0e826d"; + sha256 = "b008823c635128eb3f25e0594999cd25a7264355be82b7c30b3fb8ae7a2ede0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3113dbdb51a654d54a9da2e79a5cec42cf274a187b255a61a23fd22faee07ede"; + sha256 = "218fae2f2f4a6e0f2c217ae35d6f7b62d955ef60d1de0d923de05dd6f839c58a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4482f8870fa20bc75b9347b47a642782a5f88d42dfc2b9fe174591e8af870161"; + sha256 = "ad28b1873e2c7781dfb14e8f692c08f549496fc8afbb4eb4ccd49ff403e221d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "33bad00acbc7662c1fd81b376878e24f0dfe5ff9142c694d852ff069c05b6c76"; + sha256 = "9d8ac480fd55cb749c6cf8166d681b619310dc25f352d109004a61655d0bb779"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8a3fc6ded7317446a99571f5660b421b3a5bfec77bdc7e80e6567348a941ec2d"; + sha256 = "7c19126e32881e496e538028dc2a336cfafcfa5ae8e53d5ae1f76415829adc7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7fb59762a36306e6561c2c83dab581f4ee277dc802d77659f0c5cf5e3cd7c3d2"; + sha256 = "4fed1d825342d963e45b81b9931f152c4600494866f54795f353ae1c84c94e40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "45193e1b8c725afe88c50ba24b15ed58ea5b0f5a3bc12bdfc98c643e8d7fad5e"; + sha256 = "6cf56b2c6a0cbb6fe4161e126595f61cc0b099b526c2cbb44f5024cdc428fb86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "63b0bf93b3237f06bbe1a2ce957fb491cd4532effe61af63fcbddaca061ef7ac"; + sha256 = "bacdc8db6802246ff6293f80027eb690f02e41eef04ceb1155a3ef35c99d27d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-x86_64/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d61d89fdfcd3d3b7600fe34f756e771f3f90d32bb90516380d797302c34694be"; + sha256 = "1c41f550ba2c67d8dbbecac783642e2b21b04e4d3a6fc1bef7d9bba0dc35638a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ach/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "e66f2f991499b913518afe5a53e37115045fdf834350faf8b644df09e7364ec8"; + sha256 = "3a2eb5827dce67f9f5ffef0d68ae8b0a38bcb8635c77e3662426c6068c340836"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/af/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "52b346ea14a7b0ad74dadbdbcd3ed46d320cfb4d7f424d1fdece03ad4d1f66b2"; + sha256 = "daa0df7174e377c6ed64759460d0a7a98881a1afe1e366c5047b1dea23c7afae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/an/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "33e707f78d4e71b319a1e65ad9fee16ed0bb81623180e793ed8666abe0a11354"; + sha256 = "636e32c6b2cf823895ba1fc21c49a93d845285f1c0bb4d4edde05c88337f273b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ar/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2c90f259700b549c53f181e033fc4e09d5ba2214138b6f91b8a460421f7f6d32"; + sha256 = "cbc5a4a80bedfc115aa3d8450b809ef39ef80a6a5ca7446b233a11045d78da1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ast/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "8bb0dfb593ccc5e069884a94afe9e887745210a90788479cd3138320ff040256"; + sha256 = "11a799ebbc18f489ed0043718c7091d352d21e8f5669b841eec17c3b930e15be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/az/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5da0ddff94084201d97d428f8042218f49393bf55654caa70791862f9b320910"; + sha256 = "e491a0d636a602d8881080f237c55583270d0ca62b3350905deb8c26d092b190"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/be/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "20232118c8f7442381f7833bb749826bdc9a9519e70dbbc104a5bce6b9733682"; + sha256 = "ed3a53f09502548054476ae26475de0068c33c1dbe2080b68dc88da2c6c07f86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9ea61d47b3d79c406ddcb85b459fe61bcfcb0dedc648ae89133bad80144aa82b"; + sha256 = "7e19ca96797de41c55f2d81e17418f4912e286099193c4d23356432d937dd467"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "770a816ce4c978629b30d66f13da2b8de2980810fdbe3598338a95b1a77ae68f"; + sha256 = "23e1ad144a6564e91420ff1616ed81b577e15bb2c48803dd73a408788a791e8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/br/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f14d885a144bfafe40f70862c50cf516049459f4864f272ff3d269b1b77cdf4d"; + sha256 = "32b8631482a1a27aceac69aec87d4094f7e7a8dbfe04310cda692241bb1d51b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/bs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "a9a1040e40c6702a95db4d0d86fff33acc0ad55f5bc735ffb3fc18ded6feb79a"; + sha256 = "575ac3d86f62665a4c496e634778e3d1a7258dc73f6c2ce6727e2a96e9d2ac03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ca-valencia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1ac8221af8e449607b71eb3da8f8946e7f2fdce1c9165578387342ba61c6fb48"; + sha256 = "5e5c1f70fda621f566064248bfef9fc1629c81acc31fd3e21b23d2b122754470"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ca/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5bea3737723b4c661be9b7beb69cda311c63b38fe5d87cf1344c973eca335594"; + sha256 = "1f622038735474932239888d00c47eb8a8c719854340a838cf580ecc28a8c1cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cak/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "37f1d42a53760ddf9a1ed889e2882358592f78494421c7ef69d01a2963c684e8"; + sha256 = "f4fa8cc59a44bcefbcfc9d41ca67f1872f29073b1ead1e4da576091605721d86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "77584900b9151192e6f265e49ecc2bfaa0028c25b5cec613f384a30d37139f8d"; + sha256 = "fa764b4dae4384442f1e2c4424b8b82678a3910a5873dc068b605795ab803673"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/cy/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1f8521e35a57059bb3aad1d5fa95ac775eda03ead75bfe6116cc67ff587db40f"; + sha256 = "c16333d4334148e77f4c36a1dbdeebbad52964af903f4913cc12a76997651585"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/da/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "89aa8777ea726995b70101bef359b3cf13079520c445a5d44ca6434bba96b0ae"; + sha256 = "49f5bbe32fd51898fea03249af04cf922891fa57b5d03afd49b92a7eb6305fa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/de/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "987e645e8d7a6b770a3056a115975a9a216143aa05e7ec215c83ad23b77df1bc"; + sha256 = "4b5b5a07a09fb47451ce79aa9b4331d12e64222e7bddc950db4e8c4f660e682a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/dsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d0a1cd64c2ba6d86e405bc05ee5b172f4c696682d2b798bdbecb91da718495e6"; + sha256 = "9ecc41b2fd42e3595bff98aacbb670081340175c1594b2e5e863d49be9747575"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/el/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "fbf403d72c4919e096d6109250a4c790a2a18bb02561f3a3bb690c2c2e1ac217"; + sha256 = "c14cb71af1fa07286df672db42140528807015e4c633862f145d311ee67d211f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-CA/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e5218c485ea7ee01e739458fd107f8c29547c542a89751f82f82a3b798c4e6e8"; + sha256 = "de205306cdcabc1f8764e048b0189f31dd59265282a0d48804dd5e01d65eb4b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-GB/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8ba466d9fa8f14b9821848978adcc5ba96b166848b9201925ff3004d4e1a2ef9"; + sha256 = "87337c3c036f2dacce295ce3044f313266910f7911037c1d1eddb7c633c79703"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/en-US/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "32c4b2e802a41605096a99b2097c2a00ae7c15c26135785dc8705ced9b6d7f94"; + sha256 = "8bc2cbabfe34d0bf8eb72f3ae9a5db6b4da83b659385c80059ff468f436e122c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/eo/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "fe8ee251678725a011273fafd04670b3d720388d9a4f04266b947bc73c815aba"; + sha256 = "ae1ad3d5c365a96e4ec862eb59cabed185e0f5ed0ea1c196a726db8307d56722"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-AR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8a2980ce33cc992a7248addb48826dc8ebb553c768101c01edf4d26cf69d86a4"; + sha256 = "c7f7c52b27a98a6ec5620178e0d7d9989cc80ff33d8a8bb8c9901d14d470ecd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-CL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "cfaf1fabe0274e256e74d9069b89017fe8b7a556898f6730eb9f95cc19cbe0a6"; + sha256 = "5c40f644cdcc273a7c5296758c903386bdf72c928d71c598ab1cc524791bd12f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-ES/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "05841e5fb59d95a46d0cfc82da624dfe9baefea66916e35ee2721c9c85f86986"; + sha256 = "66cf9339ae8c7703b23ac94fbe4d641b3dd2d4201011a49c3d98859874481fe8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/es-MX/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b73618a25a2e274208e9873a3f71a1d87fe39b7a1095fdbdfe1de44a3ea5b62d"; + sha256 = "6424538eb209875fa42391bf4457b1160d066ff94cbcb35cacb4698a6c87a158"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/et/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "72e81b5d422b6e67f0fbc0866f162d3a9d61d6041b964ca68d7308ce6e320152"; + sha256 = "2d24a51753787c300fdee4a837d360706a206d81063ba90e45b0a39dfec19704"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/eu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "09a284cebf4a9f913b77504f2c9a8e2ad2e6ffd1502ad6b996c674fd1d3c6099"; + sha256 = "e071a830171829fd0ae7407a0e36e2cd4d732d0bdc5d95f308ae645b15e43352"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fa/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d359828d106d6d8f3d230d96c479f722333f01bce1edabca23b8038aa331da76"; + sha256 = "28f1e8e0e4c663d1f4651b598f0981f02170fb70f566b56ecb4fa695ad43b062"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ff/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "fafca6471669a4da24bf97191a49f26a7c65b4a1c53cc06b5e3803dda217c1b9"; + sha256 = "8538d13b4036fa20eb9f05588ceb58615e47a91f40e52b80fe8bacb0815d2280"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "76c96649716666bbedc187e0fdf92f7b6ef5ead7df48c43bc91b650e72636d3c"; + sha256 = "5db06424e691bb8a38752f8b4479682b211b944054b624c6fb2b0517d6dbe8a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "be8279d893347726c9ebebf9299fa8708c7c00815fec0458ac7a3acfd926877b"; + sha256 = "0d239d9d7f6e7072d44faa571ed47c1943c6593532e8f5d13adcfb3c6270858c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "e4817a0d0f17d0346da545dab0352a24224d6d857e601f6f7742d2989da5d15b"; + sha256 = "0cf201905007894685d3e2f2a5555ba478385e576546112912ad51304aa0fcb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/fy-NL/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "151473d60d6805f01bf38996d5f73fa3d82ede2b065d911a8e14a16cd70bed96"; + sha256 = "4390d196894b898724dc31ccd30d85795a6094641839ea3b688253fd7fa59925"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ga-IE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a5a2b8136440ec821b40a5e8b7f7e4562ddd7891a841dc8802be80a59e5f1e12"; + sha256 = "07f04a17bea08570c902a7588b770a0b32763a792de46b2c6ebf4c6323d8e72a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gd/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "622ce9d6f24fcd37f8d8ef5a3a9e1a732d4bfc2f603de80197ceeffcf9b6696c"; + sha256 = "ab87018a5cf04c903a41bee02528796d5537533688d50e21f66dc7c5210e2197"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4adcb05f434f997df7f46fcaa19df53f58dac17df707e57f65cf6eb6b2b8f4d3"; + sha256 = "d2b36736a16b6673d9051cad9df7bf503903c09b0bd4c0492c3445a55ee11f9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d51507f9da81d364277456513f4448cbe32a15123b9b2b91a09dbc856293ad96"; + sha256 = "587333196ad1a404bafca6bc72a9fa76601454a1510143d8ac1aa3a21b2ac0ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/gu-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f390363b651338dd150cfd4a52e046c790ea0213cf8ec91ba57a0b89fc1f1b63"; + sha256 = "f5fd1e4959895c253186feedcf64abe577452c7099778067046438f6409c0f4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/he/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "df8eab1a07e1e54bba9748676c9f59b0f1145ad877f5e6ecd962f1aef797cd1e"; + sha256 = "f5d3701b4ea8715e8ce3d8870ca2ef103804b529006c264d35df5174048cac7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hi-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "27c4c32368e9324cc64bb2cf91d43254bf4b7c80521982be32f75ef495ee3f0f"; + sha256 = "cc3f712afd9b6866798158be07855cb49a30764a03c64463c458774bf6303af3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3936fce57b69027bab9a96590fe67291ab1480873c0a68174d0b0fc61738fd8e"; + sha256 = "3833d16b4b9c98547f9f405fee4d150763529d4c87e09d2ae1e9c62bdf09ebe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hsb/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7d881992dd651be4fcbb50fe5b4c4b03badc9f65c7b6952c041466e44d7d9641"; + sha256 = "f9f6802195c74368f4306470bff9352644f592f84334104ec2df829118cd0889"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hu/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3f831ae076063d9209df8cc70feb71960a538170323b775a4a4ca1e9ceb4edfd"; + sha256 = "da459abb9b9b55626c11b4ec09e3de6b4ce64928e1af8c1c7edc6937d9df2fff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/hy-AM/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4a66a862bf8c549010ca27b43eca9c09f22fe4630155e8a2f7130731aa6074d2"; + sha256 = "34277bb22941f8a3e5a71646fc6a1304660a6087f66fbd6e1066ecc3efd952d9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ia/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "90d238251b4da6da55ef8b435924ca26db43d0aedcf870b4890c98e50a7ffd07"; + sha256 = "c3f2695c4a3f15a60a83f6f1561e451a75ddfa25db6827541be3d948ee3cd5e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/id/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a713d0029c0d847427ffc3c2fbf098eb37556c4aaee3739f8596fb83a47b0139"; + sha256 = "b44069f8b898d751dd42825ed55a216b7cb2b78dbc187894ae886cbb0ce1303f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/is/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "40b85698fdc815fa8646c38a92fa2f5303535e89dd084a176f5257ffe9d1f3c6"; + sha256 = "d566b05d2de587f8f377f0552b8611f3232a1b2ce71270a956690b04edeaa8a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/it/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "466b43b80e14ac93c65cd14a8397de012108fb9f4ed2e7e2ae3101a4274ccdb9"; + sha256 = "5b79674af83be412e986376807a04ae59f5b96c4a59c905c951b7b29baf76cf0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ja/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c192d0fc009525cf37c1a92b35447d36e28f7f634cc4bdf17d4a081d93f4de3d"; + sha256 = "1324e8ca99b2e7a9e7d671c0dd066553dd2a60f5f0535103d372aad287e36281"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ka/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5f89a19083afda92007b8b17768332fce88abe382ba75223d4773914cb350391"; + sha256 = "97cfc20dd249d8934d1e92f0edc9b4db9fac00e1ae3f6e256b4cc8e960bcbc66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kab/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8630b6b872a9851233a47cb1826d26fd54d61b5191f819f8901581dcee7dcfbf"; + sha256 = "746186d77f3bfac4ea34dddc6d5bc0fe1a1a2fdc1beaae6946bd58a5415bb732"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "443ed4b04c8cf2643f26b0f726466553c79e8d2431a2e85f2405f30b2ea00342"; + sha256 = "48e2283eddc4f2eec476a7b847997705686985956ac2bcf0677b06600d2cccea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/km/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8e01e4eab13f7ea9b78ef2f7309063f117221b402c907b4af529d2c59629acad"; + sha256 = "8255888fa2771c50a7cbacca023dd2218908b46bb52a4a070073b89af86ed9f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/kn/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "e2c2b109bac9ff9d513a8551f307258afef9304bf986d8834f21b9619c6d360d"; + sha256 = "17ac76150b550f26af69b7cf36dae1441602d3bedf7cc8398f102b6a41b00775"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ko/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c285e096e7d8da8c6edee6c5c72f6429b2aca3c9f95ae77eebbe5799206fd53a"; + sha256 = "794c3566a5ec2751dcde9b0038b0d11f64d5443972fba058d8c1d66e2a768d7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lij/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "11272290885f5028fbd9190a05656074e24dc8cf1e506de54a77cedc861645c1"; + sha256 = "5dcad09ef1e16c8c8fbdfa76b180f66df354dd3a3184a95a9ee219619d623126"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lt/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "770a9bb5251c933a000be6529ad1adc67d14900acfccc8f07b3a32fe4e2bbf48"; + sha256 = "67ea002179152fd697c2b7cc6028f67eb8d1809233127ad3a79e48937874e479"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/lv/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "73c74c2e358ca4179d3e2261c439a06b8f6b22217273165aa63f7ef7778f965b"; + sha256 = "ee90670d050beb555b8375903397cf55cc9f4a54d806a32c9383150799b67a9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/mk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "493ee4f4eaafa98d22d734b4c037b454cc0fea5dccd5865c17c7523f713e5835"; + sha256 = "b47befd2ad2eaf66842e159601bb312dad71b665d8c8af9eec5d2ba646e26fc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/mr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "3d02e80827959d4aff8a78cd9e681c1b5ac24965e9f97a0912b9dcd16ad1b69f"; + sha256 = "33dfca6116afcbc1edf83d4e30c32c3e52a320a1b447521a017502a2cf2abc33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ms/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e94836fed969144beeefb6aaa1f8fa4ab463e17d03745f9b594b7a7307710133"; + sha256 = "310f06f2ccbb321da8b2f7ea1b302f0c90fa6d0d19aa4cac40e08710adb42c49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/my/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "5d7cae491b790b35f3f54a5f09f8f108488ebabbe91c193c168ba8a9d0111810"; + sha256 = "4e8b59a810144fc8407ffcee81bae69f3b3b8458920eb8c30affb59e432ca49f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nb-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "37d252715814c726ff098be56ea4e9f0ebd2060730bc791ce94f5ac09a5a9fcc"; + sha256 = "3fc8c97733acab28b7b59142e8acd6438251c83cdc7b37ced2a74c7ad5de9af2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ne-NP/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "35780666ed985a7005309225960abf7641fc94ef51cadfd7b07e13f10e21b1c1"; + sha256 = "939a528486c9e9a7d5692c9c248aa8f2c9ba9d86bd6508fc1eaf84f8a21c8731"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9008a849b7f19ced4bcda7180bad556bf7ba99f16b2decd227beecbf87353c38"; + sha256 = "01a5fcf60e9599128f7d5663d83428825db59d5a49139348c3b3a5fe48ce5d25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/nn-NO/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7ab1b728c8a008d8d483f8dbb93498f005956aea5bb880880abe0ba07a4fd63e"; + sha256 = "4e8fe32b83d51a01c1a718fdbdf21eff87f3388995426dca460a583b63a8c3c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/oc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c2f7948a00fcf8553ef197a8d459595e05022441739dd14eb44bd809d9f2ea1d"; + sha256 = "2cfcab5226ce8901cff407c9175a712ade1bae871be9c37f044e88babdfdc68e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pa-IN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "98b006c8cebf43271bf6626f695f315b94b3cf3bd4313e4e6919e0925570fc32"; + sha256 = "2bab73df49224bdb79f6d0db857d181e8a0153631eebe4b54c40302dbf664ca5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0e9310909e050e3a3a7903279e052c259658642a806f4ecc19ab941c3f8cfa56"; + sha256 = "022130cd8d3a4f13a2734b09eafada4cb3582f0a04771a2b38e2e8782a077eb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pt-BR/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a2821955bd876cc0e5ab8f0695c378f208b11b6b26b8ad80e62de3c0632bc516"; + sha256 = "d4804bb273803d762711416831ed6fadfed28e09a92cae166b47d436fee3ce2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/pt-PT/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4e69265f84102ddc8633dbd9dc9b42f9b763d318f9cce6323b24915901a2ff4d"; + sha256 = "e7e0bb5138aae26ceb12aa014a4a365d69141a3f6d0d437e5d9112a1e1d9222e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/rm/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "ed8365be83de63babb9e779fb676fc7165f5d3dba7b77b6ec700220a34e996c1"; + sha256 = "09e93cde46ee4d590c233a5a1731657722d7d68772867a9601b9d561e166c8c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ro/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "ae139d838e133ba25c2c179993a5281d581cfc565ea2dd907e1bf9e555b891b4"; + sha256 = "cdc004090e30db5bba10906550ed9532e7053a3cdbd6525280978d06fa87aa44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ru/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3cdcaae6f094ebc14d5d52e900421004144dc3525f57c2785aebdd9d285c13ec"; + sha256 = "be2bc2843148d4241f5a59c8cf840552eacff056906f4712172047186d7e1ca5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sat/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "dd46e31c65618c0f7f89199db22aa5cb7a010488e4e43d26e47b04a5ab3fd0d5"; + sha256 = "c326732c2ac6b12ebc2fadb464bff49d24b193e229f32be7c17ce30b8c8584e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sc/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "bd45ea0bc293b1b67328af231abbad527845d5999c2a03f0ffea0dbf63275a0f"; + sha256 = "f7c6823d9196245f2f6ecf4cbdd9b82397cbb39bd2be7c3866a6bf592b055a22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sco/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "7a7657056204bb6b19b4946491effc86b73360d29f2c5a680a0db613cdca3191"; + sha256 = "3533e52edd9ee565119adb2eb04048e7f03442a59d0342cf63ba0e515edd544b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/si/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c03b64e6e7ecb912782e5f4fc87f494ef2caf034985cb7a004477d8883aae850"; + sha256 = "94a37d1d5dc04726f2b10831db8fc21ca48ad22eb08d4bd64641f849ef395d0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a63bd241b30a31f31e25e091caaa8038e49c682c42f25d1a0b7334b0caf03e34"; + sha256 = "53bdf98c1b6f21c8134d3f68241dcf64bc351f5926ee23ef1435d5e1fd7469df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/skr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "0cd7e2da49bfb2313e0a798921c228faae3b1aa222c43ccfe1ab059d4a1ac6e3"; + sha256 = "780e110da1c6e8c50a406cb20c5dcb25b3ea9be9701b2136372fb3f08226269b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5096116356ad33fcb05f6bffe454ae54b79eee0ea88672263d7b066acdcaef2d"; + sha256 = "2cd694302448ba68635b672597428a605f3f8d2cdbb22df86c57e28d75d1aec7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/son/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4bb412e38d2507a24bd677f6d61871ba3025b12db1de774d01992c00b89e19fe"; + sha256 = "f73388326340bae37206eb1fbbf92660f6e8c0a9aab266624d71a3e7b6ab3f81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sq/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4e0b947c64582ddddcb7b60e753495353d19f1a32daa5ccaf2703d9aa22348b5"; + sha256 = "2468e0434793844579dcee985ba36920d637e4adf4fdaeb4b7c1613567d9704c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c1113ec613f0640c44cce5db4c8f48f1231773cc78523ea7ee6a239ae472b607"; + sha256 = "5771c8dc7555725d5579095f5dd50ed6e23d92361bfbfed4e553bc358549fa6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/sv-SE/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c538a9314bbb012bed16f4d16f98e80e3dfe18416d9442e786954fe73886ba59"; + sha256 = "dcd1c02909989a1638dffff4ee1fb75c37e870741dbfd1cd32a3c0b514d6043e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/szl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "201acbefe7608a5d0d0ea89f8da966dac62c7acebf679a09c855c1388f5fb816"; + sha256 = "d988fdfc0e57fe822e2e41f6e21b3aec3a6469008498f8a974fdcafe2e042f54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ta/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "45661ac364bede078028129a62c856781a56c3f9028d932e87d4218800f9e0e1"; + sha256 = "a98e68d852422275c0529050248402ea9e6729e824cb9792df3c55e326c876b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/te/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "6f6ef84f418b307e511ee2623e7e4e1f0f38f81a6a2b2b8917978cab59a670fe"; + sha256 = "a8050a4a065eb9d6cf78e61dce4ae006c7b6d10dc404b1ae4d201c9403852c03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tg/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "49b05c0b7b5e3f399f72786326f83b4ea6a93095430b3d6b5c90165a677c9b9a"; + sha256 = "d81e3d9420a988f584564f56293ce4989cb99a9e68beff0bb591ed131baf1d41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/th/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "61be51a10a0bc93f04e8995606e381565fd215f8ed308ea2e2b0761c217058c3"; + sha256 = "e020cffc3cc7617bae35ed7675d1b264d77e6f0f76800197790941fe4584fae9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tl/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a6c0d272f09e687cc6d66be5995044381f26e03d9d985eebc69e4397d977235f"; + sha256 = "dddabf60e22b6e394e6b1f8353dbed640ef5726c795ea5eee75f5b0256fbd12d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/tr/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "aff95021c9647e80c85813f194cb3adfe25845397a478e5cb0e2206901c2de70"; + sha256 = "72098506c6015d0d9a419ff59c5271a592118fbcf43417375b6a405ff431243a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/trs/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "68429a694176e397845a8dc88e145c053eefb6d1ecc891fd9bd119f346023cf9"; + sha256 = "0977603a758eb53309b77743d6596fc7a3cb060d0114c20327ebd86277f11b59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/uk/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f210e6f0fabbd0c61213903131b8f9a6531eb1d1f473674b91371a22c62bd2ed"; + sha256 = "196e7aeb323c62e50fb653ce035ebe325c94eeaa8420d5d9980dd46bd4f34f4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/ur/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "604b41af2ea67cc46928e0d92caff5e76b6e5a29ed7b8100c739bfd9194e7576"; + sha256 = "c651eddc5c4e80d6e64b3287e83b7d5dfc6b1966d4737c8cf701b4ecdf076d78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/uz/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "645d5cab05d4b50abc522e3d8327f658975bd8d60b1a8fc2da01b54f853d062d"; + sha256 = "e67a0a7ef1a21ae11fc17714fa9c689f863da60c7a200a5c6918c3ac9ec31dc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/vi/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "129e9b5a687ef92591a361f3bb4f64963d17264553895b69273b0d42a1a91c6f"; + sha256 = "878b37478ab82baea6842eccd38ee9edd4062d22344a9d7529368a9a64106132"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/xh/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "f9da5c5f850314b0a3e17fea14cfd1d32e4a8249bccd8edcb7b5ddc04ae0ec39"; + sha256 = "69bcb64b013ed2287608eaafead61bde447627d29f237a380918065cd5887a75"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/zh-CN/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7af8a93f0f09203c20081d2635a21e821fc82e1556ae7c8b311a5ea80e23ca19"; + sha256 = "9b3cfa6371c0ddf1269d6476833b069bdc974c2c383dbec2ec493784dcf325e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b6/linux-i686/zh-TW/firefox-132.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ce1b86777710d7dc1ed445c68d7ea21b3f0d45f28bfdc816af6da945cb6fb5a2"; + sha256 = "dea871f11810dacb3c8a443d85266357a164df36f8e8ce9aa50617d4e09fd307"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f31e07452884..5f766127de3e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,11 +35,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "132.0b5"; + version = "132.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "7b9b3120ce3f5918bb0a6d385b23503ff2dbd0b6171d63ce6310eca43d252537b43cc79ace326d2e29611ae4fb06d815bcaefb63c6942d00e53277deeb0eba70"; + sha512 = "0c491e2a601d6989c10cdd757c83453e07454113dac8e4de154df04386fc0797ee5146dcdc8ca904692a6cb87246b54a4f5e93057afd20f23701abd3f61a6985"; }; meta = { @@ -64,13 +64,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "132.0b5"; + version = "132.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3c2f028ae1d2ebf01a4fc341ee7f706bfdacb0c4dd2db2e3f24b42fe1e4e89f67a3827ad794c557c084a723272928264ae9e0bf67a4268078ebd8e4af1f97688"; + sha512 = "3393bb677c6e735860ef49c837ffab10720c6eb47d6cfb6c7960267e3676c69c8293b5f7e49de3f91b6eb88fa4780300db2b2653dde1ae38d546f473bca7e34b"; }; meta = { diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index f699a53552ae..2aea823dd472 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.34"; + version = "0.6.35"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-rbZySF7DrBN37YIetFXZE/aPSRex5cQnV8FZ0KDQ71k="; + hash = "sha256-ohT4h9w6gaOk6C3O8eUBcmXHRSzL2mcRO8RnNY8htso="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 2d9136484e22..24779b603511 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { doCheck = false; # requires docker, container-diff (unpackaged yet) - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash fish zsh; do $out/bin/executor completion $shell > executor.$shell installShellCompletion executor.$shell diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 27eb93f11824..e8156c872c2c 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { ''; doCheck = true; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd kubeshark \ --bash <($out/bin/kubeshark completion bash) \ --fish <($out/bin/kubeshark completion fish) \ diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/applications/networking/cluster/kubevela/default.nix index 75e68b3c1944..b61535492b1e 100644 --- a/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/pkgs/applications/networking/cluster/kubevela/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd vela \ --bash <($out/bin/vela completion bash) \ --zsh <($out/bin/vela completion zsh) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 79ef8a462f6d..db6057d758c4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -162,11 +162,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-ny/FjAStb4qUzVeAkkqgKDb5lzmR6e0J1RaG6CWBrYg=", + "hash": "sha256-7Km+FqUyCCFzVmSpg4m7FuWs3MF+mKqPxEQApQqe35M=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.4", + "rev": "v1.22.5", "spdx": "MPL-2.0", "vendorHash": null }, @@ -399,13 +399,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-FFUmNDP10Aqj5aBWuYYO1redZlXMNVLEskQAjPSgXoY=", + "hash": "sha256-RlJsM5gZPHQxE7Lab2J1MVFL1YaSz2kC/1F68Nep1jc=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v2.8.0", + "rev": "v2.9.0", "spdx": "MIT", - "vendorHash": "sha256-k9NmPXtvjLDWDGMbloJwErNkzuJVe8T6lnlYE2iO5w4=" + "vendorHash": "sha256-D08K1+0m5HcLTr6VfP0adMdTBh6st4cQyWf95fd6GlY=" }, "exoscale": { "hash": "sha256-fS7ZK+d7paUoaPuxXh6N6Sw38dzlxOAVCHgsHUL2Gz8=", @@ -994,13 +994,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=", + "hash": "sha256-ldiMHcA0uJa7z5qx8ATuu7wn6W7HTLXEw3CG9rGnU/4=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.23.0", + "rev": "v1.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI=" + "vendorHash": "sha256-2DWYW/NoNqchnfxEPBCFstzGuFKwXAXVmS9RqRWViWo=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1772fb7a9cd7..29d22aa5049b 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -47,6 +47,14 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; + preBuild = '' + python make.py build --dist unix + ''; + + postInstall = '' + python make.py install --dist unix --prefix=$out + ''; + preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index c2c8f98251b6..e999c27cfb09 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -117,7 +117,7 @@ let --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # In particular, this detects missing python imports in some of the tools. postFixup = let # TODO: python is a script, so it doesn't work as interpreter on darwin diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index d8f898ef11c8..52ee8d79266a 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-x9GDiSkkO0zYx/veB6xSr6/9/SW6JRTGAASlvWd/P0c="; + hash = "sha256-ndFv5rNTWyqrGGC8t1JNR+bQC0Jsit4I9p4ng7h/gcU="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 706904a8dd2c..259735919cd5 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeCheckInputs = [ check ]; meta = with lib; { diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 29f044536981..01ced9fc8631 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,6 +21,7 @@ , sphinx , sqlite , xdg-utils +, qtwayland , wrapQtAppsHook }: @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { qtwebengine qtwebsockets sqlite + qtwayland ]; qtWrapperArgs = [ diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index aeb6ec21fb26..fb363bc802f4 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { version = "0.12.1"; src = fetchFromGitea { - domain = "maxwell.ydns.eu/git"; + domain = "maxwell.eurofusion.eu/git"; owner = "rnhmjoj"; repo = "magnetico"; rev = "v${version}"; @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; - homepage = "https://maxwell.ydns.eu/git/rnhmjoj/magnetico"; + homepage = "https://maxwell.eurofusion.eu/git/rnhmjoj/magnetico"; license = licenses.agpl3Only; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index d03b60da6e73..87918b9e854f 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,7 +1,9 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , fetchpatch +, autoreconfHook269 +, autoconf-archive , pkg-config , gtk3 , fribidi @@ -24,9 +26,12 @@ stdenv.mkDerivation rec { pname = "abiword"; version = "3.0.5"; - src = fetchurl { - url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz"; - hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "AbiWord"; + rev = "refs/tags/release-${version}"; + hash = "sha256-Z55qPm4MYwbG8bvXpX2TH8bxQaJjvb3Em1ymM1XwGqo="; }; patches = [ @@ -38,6 +43,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + autoreconfHook269 + autoconf-archive pkg-config wrapGAppsHook3 perl @@ -62,10 +69,18 @@ stdenv.mkDerivation rec { strictDeps = true; enableParallelBuilding = true; + postPatch = '' + patchShebangs ./tools/cdump/xp/cdump.pl ./po/ui-backport.pl + ''; + + preAutoreconf = '' + ./autogen-common.sh + ''; + meta = with lib; { description = "Word processing program, similar to Microsoft Word"; mainProgram = "abiword"; - homepage = "https://www.abisource.com/"; + homepage = "https://gitlab.gnome.org/World/AbiWord/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ylwghst sna ]; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index a910d76b29c9..86547c638dfa 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "kmymoney/plugins/woob/interface/kmymoneywoob.py" ''; - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeInstallCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index e591c98f30de..7c7d5f574a3f 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Amateur radio logging program"; - longDescription = - '' Xlog is an amateur radio logging program. - It supports cabrillo, ADIF, trlog (format also used by tlf), - and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. - Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, - location in latitude and longitude and distance and heading in kilometers or miles, - both for short and long path. - ''; + longDescription = '' + Xlog is an amateur radio logging program. + It supports cabrillo, ADIF, trlog (format also used by tlf), + and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. + Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, + location in latitude and longitude and distance and heading in kilometers or miles, + both for short and long path. + ''; homepage = "https://www.nongnu.org/xlog"; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index 6123f277fd12..206f7110fff9 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { description = "sets the X root window to an image of the Earth"; mainProgram = "xearth"; homepage = "https://xearth.org"; - longDescription = - '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, - correctly shaded for the current position of the Sun. - By default, xearth updates the displayed image every five minutes. - ''; + longDescription = '' + Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, + correctly shaded for the current position of the Sun. + By default, xearth updates the displayed image every five minutes. + ''; maintainers = [ maintainers.mafo ]; license = { fullName = "xearth license"; diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 791d6049ad6d..9dc5fcb1feb7 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -96,8 +96,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - description = ''Basic Local Alignment Search Tool (BLAST) finds regions of - similarity between biological sequences''; + description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences''; homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; license = licenses.publicDomain; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 531f9047ba2b..f454bfc4f415 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -43,9 +43,11 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Computational Morphometry Toolkit"; mainProgram = "cmtk"; - longDescription = ''A software toolkit for computational morphometry of + longDescription = '' + A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a - back-end general-purpose library for processing and I/O''; + back-end general-purpose library for processing and I/O + ''; maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 90fe611209f5..ef501c12f6b4 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { meta = { description = "European Molecular Biology Open Software Suite"; - longDescription = ''EMBOSS is a free Open Source software analysis package - specially developed for the needs of the molecular biology (e.g. EMBnet) - user community, including libraries. The software automatically copes with - data in a variety of formats and even allows transparent retrieval of - sequence data from the web.''; + longDescription = '' + EMBOSS is a free Open Source software analysis package + specially developed for the needs of the molecular biology (e.g. EMBnet) + user community, including libraries. The software automatically copes with + data in a variety of formats and even allows transparent retrieval of + sequence data from the web. + ''; license = lib.licenses.gpl2; homepage = "https://emboss.sourceforge.net/"; }; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index a48019febb1d..80704698c07b 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.2.21"; + version = "16.3.1"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-9gIOrHoy0JyoPXaHOfBDHCL+ykmmHNam+Um12sHqZsE="; + hash = "sha256-mjID6o+2yhzKd1g3MO4as1dA11nhessjzCDHSUyUQBw="; }; patchPhase = '' diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 1503d3a89957..2dffa14c6614 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -49,7 +49,7 @@ , zlib , gsl , ntl -, jdk +, jre8 , less }: @@ -96,7 +96,7 @@ let ecm lcalc rubiks - jdk # only needed for `jmol` which may be replaced in the future + jre8 # only needed for `jmol` (https://sourceforge.net/p/jmol/mailman/message/58818762/), which will be optional in sage 10.5 less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ] )); diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 590b429e73f0..713238cc3f85 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { meta = { description = "Visualization framework for the analysis and visualization of relational data"; - longDescription = - '' Tulip is an information visualization framework dedicated to the - analysis and visualization of relational data. Tulip aims to - provide the developer with a complete library, supporting the design - of interactive information visualization applications for relational - data that can be tailored to the problems he or she is addressing. - ''; + longDescription = '' + Tulip is an information visualization framework dedicated to the + analysis and visualization of relational data. Tulip aims to + provide the developer with a complete library, supporting the design + of interactive information visualization applications for relational + data that can be tailored to the problems he or she is addressing. + ''; homepage = "http://tulip.labri.fr/"; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 33691aaef491..2dfee198c06e 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MrlzAZWLgfwIoTdxY+fjWbrv7tygAjnxXebiEgwOM9A="; + hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE="; }; - cargoHash = "sha256-7HPTELRlmyjj7CXNbgqrzxW548BgbxybWi+tT3rOCX0="; + cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 9443c1e9cdea..a00cc8e78cc7 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; configureFlags = lib.optional (!withInternalSqlite) "--disable-internal-sqlite" diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index b838eb6f74f9..7cfeb20e8de2 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/rcs/"; description = "Revision control system"; - longDescription = - '' The GNU Revision Control System (RCS) manages multiple revisions of - files. RCS automates the storing, retrieval, logging, - identification, and merging of revisions. RCS is useful for text - that is revised frequently, including source code, programs, - documentation, graphics, papers, and form letters. - ''; + longDescription = '' + The GNU Revision Control System (RCS) manages multiple revisions of + files. RCS automates the storing, retrieval, logging, + identification, and merging of revisions. RCS is useful for text + that is revised frequently, including source code, programs, + documentation, graphics, papers, and form letters. + ''; license = lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 4d36bdc4a892..96436449e621 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.3.7"; + version = "0.3.8"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw="; + hash = "sha256-dHjEmE/m5lAF3XyyebO/23BLmoS5sfSoNZuTtJv/JEA="; }; postInstall = '' diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index e5ab20cf1937..1f4c717accd6 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -49,7 +49,7 @@ let # feature, but rather to make the program more robustly self- # contained. - postInstall = ''${o.postInstall or ""} + postInstall = o.postInstall or "" + '' mkdir -p $out/libexec mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion \ diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index b921f161f012..1e8ac0ec66ef 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -412,6 +412,7 @@ remove_tmpPath() { } remove_tmpHomePath() { + chmod -R u+w "$tmpHomePath" rm -rf "$tmpHomePath" } diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index a82728ef1025..52d4155f4604 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -19,7 +19,8 @@ curl=( --user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion" ) -if ! [ -f "$SSL_CERT_FILE" ]; then +# Default fallback value defined in pkgs/build-support/fetchurl/default.nix +if [ "$SSL_CERT_FILE" == "/no-cert-file.crt" ]; then curl+=(--insecure) fi diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index e4a70743334b..ccfc02d47c54 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -220,20 +220,26 @@ stdenvNoCC.mkDerivation ( # New-style output content requirements. inherit (hash_) outputHashAlgo outputHash; - # Disable TLS verification only when we know the hash and no credentials are - # needed to access the resource SSL_CERT_FILE = - if + let + nixSSLCertFile = builtins.getEnv "NIX_SSL_CERT_FILE"; + in + if nixSSLCertFile != "" then + nixSSLCertFile + else if ( hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash + # Make sure we always enforce TLS verification when credentials + # are needed to access the resource || netrcPhase != null ) then "${cacert}/etc/ssl/certs/ca-bundle.crt" else + # Fallback to stdenv default, see pkgs/stdenv/generic/setup.sh "/no-cert-file.crt"; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; diff --git a/pkgs/build-support/go/package.nix b/pkgs/build-support/go/package.nix index 754736dfbe6e..f0b98d155e5a 100644 --- a/pkgs/build-support/go/package.nix +++ b/pkgs/build-support/go/package.nix @@ -289,6 +289,7 @@ lib.warnIf (buildFlags != "" || buildFlagsArray != "") "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead" lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule" lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true" -lib.warn '''buildGoPackage' is deprecated and will be removed for the 25.05 release. -Please use 'buildGoModule' instead. Tips for migration can be found in the Go section of the nixpkgs manual.'' +lib.warn '' + 'buildGoPackage' is deprecated and will be removed for the 25.05 release. + Please use 'buildGoModule' instead. Tips for migration can be found in the Go section of the nixpkgs manual.'' package diff --git a/pkgs/build-support/make-pkgconfigitem/default.nix b/pkgs/build-support/make-pkgconfigitem/default.nix index e459184b8d7e..52c1fd3af979 100644 --- a/pkgs/build-support/make-pkgconfigitem/default.nix +++ b/pkgs/build-support/make-pkgconfigitem/default.nix @@ -51,9 +51,7 @@ let lib.pipe attrs [ (lib.mapAttrsToList renderFunc) (builtins.filter (v: v != "")) - (builtins.concatStringsSep "\n") - (section: ''${section} - '') + (lib.concatLines) ]; variablesSectionRendered = renderSomething renderVariable variables; diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 348cd5b8345c..8d5980917464 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -160,7 +160,8 @@ stdenv.mkDerivation ( # Build out of source tree and make the source tree read-only. This # helps catch violations of the GNU Coding Standards (info # "(standards) Configuration"), like `make distcheck' does. - '' mkdir "../build" + '' + mkdir "../build" cd "../build" configureScript="../$sourceRoot/configure" chmod -R a-w "../$sourceRoot" diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 2dc130e55d85..b0c9f93649c9 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -469,7 +469,11 @@ rec { as a easy way to build multiple derivations at once. */ symlinkJoin = - args_@{ name + args_@{ + name ? + assert lib.assertMsg (args_ ? pname && args_ ? version) + "symlinkJoin requires either a `name` OR `pname` and `version`"; + "${args_.pname}-${args_.version}" , paths , preferLocalBuild ? true , allowSubstitutes ? false diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 0e82446e666a..526137ae4293 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.67.3"; + version = "1.67.4"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU="; + hash = "sha256-zHJE3sau2KAbPNafUw2+OPFI5RRomqzr1QMEB1vfq3I="; }; - vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080="; + vendorHash = "sha256-rZn3SYcuFay2pjGad+NhEf8dmzonsvO7M4OQovT8otg="; subPackages = [ "cmd/api-linter" ]; diff --git a/pkgs/by-name/ap/appimageupdate/package.nix b/pkgs/by-name/ap/appimageupdate/package.nix new file mode 100644 index 000000000000..b1af05103d8a --- /dev/null +++ b/pkgs/by-name/ap/appimageupdate/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + qt5, + zsync2, + libcpr, + libgcrypt, + libappimage, + argagg, + nlohmann_json, + gpgme, + appimageupdate-qt, + withQtUI ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "appimageupdate"; + version = "2.0.0-alpha-1-20230526"; + + src = fetchFromGitHub { + owner = "AppImageCommunity"; + repo = "AppImageUpdate"; + rev = finalAttrs.version; + hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \ + --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' \ + --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \ + --replace-fail '' '' + ''; + + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals withQtUI [ + qt5.wrapQtAppsHook + ]; + + buildInputs = + [ + zsync2 + libcpr + libgcrypt + libappimage + argagg + nlohmann_json + gpgme + ] + ++ lib.optionals withQtUI [ + qt5.qtbase + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_ZSYNC2" true) + (lib.cmakeBool "USE_SYSTEM_LIBAPPIMAGE" true) + (lib.cmakeBool "BUILD_QT_UI" withQtUI) + ]; + + dontWrapQtApps = true; + + preFixup = lib.optionalString withQtUI '' + wrapQtApp "$out/bin/AppImageUpdate" + ''; + + passthru.tests = { + inherit appimageupdate-qt; + }; + + meta = { + description = "Update AppImages using information embedded in the AppImage itself"; + homepage = "https://github.com/AppImageCommunity/AppImageUpdate"; + license = lib.licenses.mit; + mainProgram = if withQtUI then "AppImageUpdate" else "appimageupdatetool"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 2cdd671c7504..4b4958c643b7 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "athens"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; rev = "v${version}"; - hash = "sha256-Ikm9nznJhd5ZrkJyh3ny1SZeuWVs5xgT4fpWKhVbuDA="; + hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0="; }; vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A="; diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index ea92f9c39fa0..e607b56d94d5 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -86,9 +86,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env.NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm + env.NIX_CFLAGS_COMPILE = '' + -I${librem}/include/rem -I${gsm}/include/gsm -DHAVE_INTTYPES_H -D__GLIBC__ - -D__need_timeval -D__need_timespec -D__need_time_t ''; + -D__need_timeval -D__need_timespec -D__need_time_t + ''; doInstallCheck = true; # CMake feature detection is prone to breakage between upgrades: diff --git a/pkgs/by-name/bu/bundletool/package.nix b/pkgs/by-name/bu/bundletool/package.nix index da40101e5523..58bdfaa70c97 100644 --- a/pkgs/by-name/bu/bundletool/package.nix +++ b/pkgs/by-name/bu/bundletool/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bundletool"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar"; - sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI="; + sha256 = "sha256-LUrZCPrqZAR8HMnLdH5qpmfGqxkuCWB70WtnJGqM1q4="; }; dontUnpack = true; diff --git a/pkgs/by-name/cc/ccid/package.nix b/pkgs/by-name/cc/ccid/package.nix index d2ae6be01fe9..9da29d3b9c45 100644 --- a/pkgs/by-name/cc/ccid/package.nix +++ b/pkgs/by-name/cc/ccid/package.nix @@ -5,6 +5,8 @@ flex, gitUpdater, libusb1, + meson, + ninja, pcsclite, perl, pkg-config, @@ -22,14 +24,13 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - substituteInPlace src/Makefile.am --replace-fail /bin/echo echo + substituteInPlace meson.build --replace-fail \ + "pcsc_dep.get_variable('usbdropdir')" \ + "'$out/pcsc/drivers'" ''; - configureFlags = [ - "--enable-twinserial" - "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" - "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" - "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + mesonFlags = [ + (lib.mesonBool "serial" true) ]; # error: call to undeclared function 'InterruptRead'; @@ -42,6 +43,8 @@ stdenv.mkDerivation rec { flex perl pkg-config + meson + ninja ]; buildInputs = [ @@ -51,7 +54,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules + install -Dm 0444 -t $out/lib/udev/rules.d ../src/92_pcscd_ccid.rules substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" ''; @@ -64,6 +67,14 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/rousseau/CCID.git"; }; + installCheckPhase = '' + [ -f $out/etc/reader.conf.d/libccidtwin ] + [ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ] + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ] + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so ] + [ -f $out/pcsc/drivers/serial/libccidtwin.so ] + ''; + meta = with lib; { description = "PC/SC driver for USB CCID smart card readers"; homepage = "https://ccid.apdu.fr/"; diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix new file mode 100644 index 000000000000..d95f0f6838b8 --- /dev/null +++ b/pkgs/by-name/ce/certinfo-go/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "certinfo-go"; + version = "0.1.36"; + + src = fetchFromGitHub { + owner = "paepckehh"; + repo = "certinfo"; + rev = "refs/tags/v${version}"; + hash = "sha256-ySXp5dPdGhBEbo9uvCsINCufhm9j/dIX0Jn+Ou73NjM="; + }; + + vendorHash = "sha256-wrz33FSBz4Kg9aYCj7/Pq07bP73MV9iSQKc3X39OkHc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + changelog = "https://github.com/paepckehh/certinfo/releases/tag/v${version}"; + homepage = "https://paepcke.de/certinfo"; + description = "Tool to analyze and troubleshoot x.509 & ssh certificates, encoded keys, ..."; + license = lib.licenses.bsd3; + mainProgram = "certinfo"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +} diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 80c245f74637..dca969004eb1 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; rev = "refs/tags/${version}"; - hash = "sha256-VqJZP82OIfxPBkayq0ijXDsotgKPbo34RTMuNkLfjls="; + hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg="; }; postPatch = '' diff --git a/pkgs/by-name/cl/clipcat/0001-fix-build.patch b/pkgs/by-name/cl/clipcat/0001-fix-build.patch new file mode 100644 index 000000000000..e92bb6c7a850 --- /dev/null +++ b/pkgs/by-name/cl/clipcat/0001-fix-build.patch @@ -0,0 +1,50 @@ +From 9ba11f90c4364529f220c44a3266926bf8f6a4b4 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 22 Oct 2024 18:43:20 +0800 +Subject: [PATCH] fix build + +--- + Cargo.toml | 1 - + crates/proto/build.rs | 1 - + crates/proto/src/lib.rs | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 8deae48..214a0e3 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -122,7 +122,6 @@ clipcat-server = { path = "./crates/server" } + + [workspace.lints.rust] + async_fn_in_trait = "allow" +-box_pointers = "allow" + + # TODO: deny `unused_crate_dependencies` after https://github.com/rust-lang/rust/issues/95513 being solved + unused_crate_dependencies = "allow" +diff --git a/crates/proto/build.rs b/crates/proto/build.rs +index 5e38f62..d6ba4be 100644 +--- a/crates/proto/build.rs ++++ b/crates/proto/build.rs +@@ -6,7 +6,6 @@ fn prost_config() -> Config { + config + } + +-#[allow(box_pointers)] + fn main() -> Result<(), Box> { + tonic_build::configure().compile_with_config( + prost_config(), +diff --git a/crates/proto/src/lib.rs b/crates/proto/src/lib.rs +index a7205ab..e4dcd02 100644 +--- a/crates/proto/src/lib.rs ++++ b/crates/proto/src/lib.rs +@@ -2,7 +2,6 @@ mod utils; + mod proto { + // SAFETY: allow: prost + #![allow( +- box_pointers, + unreachable_pub, + unused_qualifications, + unused_results, +-- +2.46.1 + diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index b5d22c8b5081..f62b214f9de3 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, protobuf -, installShellFiles -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + protobuf, + installShellFiles, + darwin, }: rustPlatform.buildRustPackage rec { @@ -13,8 +14,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xrelkd"; - repo = pname; - rev = "v${version}"; + repo = "clipcat"; + rev = "refs/tags/v${version}"; hash = "sha256-95y/HiLmhqt1DFmAxLg/W7lr/9dfVtce4+tx+vG2Nuw="; }; @@ -28,10 +29,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf - installShellFiles ]; + patches = [ + ./0001-fix-build.patch + ]; + checkFlags = [ # Some test cases interact with X11, skip them "--skip=test_x11_clipboard" @@ -47,12 +51,12 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with lib; { + meta = { description = "Clipboard Manager written in Rust Programming Language"; homepage = "https://github.com/xrelkd/clipcat"; - license = licenses.gpl3Only; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ xrelkd ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ xrelkd bot-wxt1221 ]; mainProgram = "clipcatd"; }; } diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index d10db99f55ac..7e69d57af88f 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-GvReoBP8QCdrKxox8yPLZEk5YvTvwr7kflpS/jN8GTg="; + hash = "sha256-CwPD+JUoKcs0HqWuZYH2c8AdwK6X0SS3aNGpkcPZ4C4="; }; vendorHash = "sha256-sLTpra7JwgF4l1UCrUtzQA4xrP4OqxBcZ1qEssBdFtk="; diff --git a/pkgs/by-name/dp/dpp/package.nix b/pkgs/by-name/dp/dpp/package.nix index bd93b48262d4..49f72d65b706 100644 --- a/pkgs/by-name/dp/dpp/package.nix +++ b/pkgs/by-name/dp/dpp/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dpp"; - version = "10.0.31"; + version = "10.0.32"; src = fetchFromGitHub { owner = "brainboxdotcc"; repo = "DPP"; rev = "v${finalAttrs.version}"; - hash = "sha256-IsgYGfPcqiJBQ1MM97jI7ksvc49ZcCn3i6/yMe8zLjY="; + hash = "sha256-pr7u4x4xdyydEQcNROjfkoV/ODqixugcTuCWMGeixC8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/du/dune3d/package.nix b/pkgs/by-name/du/dune3d/package.nix index b1e1863581b8..01d3d45a7817 100644 --- a/pkgs/by-name/du/dune3d/package.nix +++ b/pkgs/by-name/du/dune3d/package.nix @@ -29,13 +29,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "dune3d"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dune3d"; repo = "dune3d"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4="; + hash = "sha256-oS10xek4IyRrjZTBvDsjqCA9NE93vzB0W9iQEm2IMf4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ed/edopro/deps.nix b/pkgs/by-name/ed/edopro/deps.nix new file mode 100644 index 000000000000..6ca795ffab29 --- /dev/null +++ b/pkgs/by-name/ed/edopro/deps.nix @@ -0,0 +1,14 @@ +# This is automatically generated by the update script. +# DO NOT MANUALLY EDIT. +{ + assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k="; + edopro-version = "40.1.4"; + edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b"; + edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo="; + irrlicht-version = "1.9.0-unstable-2023-02-18"; + irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22"; + irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA="; + ocgcore-version = "0-unstable-2022-09-15"; + ocgcore-rev = "4a872ad7686e0d00ee4c1c051e90fc07c40613d4"; + ocgcore-hash = "sha256-s3DOHrZilRUy6fbXObNiLRinxpdHY99vDOmS/ZfOI78="; +} diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch new file mode 100644 index 000000000000..253051ebf0f7 --- /dev/null +++ b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch @@ -0,0 +1,29 @@ +From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Mon, 21 Oct 2024 17:42:24 +0200 +Subject: [PATCH] Mark Lua symbols as C symbols + +Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols. +--- + interpreter.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/interpreter.h b/interpreter.h +index 6c405a1..c471ecb 100644 +--- a/interpreter.h ++++ b/interpreter.h +@@ -9,9 +9,11 @@ + #define INTERPRETER_H_ + + // Due to longjmp behaviour, we must build Lua as C++ to avoid UB ++extern "C" { + #include + #include + #include ++} + + #include "common.h" + #include +-- +2.44.1 + diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix new file mode 100644 index 000000000000..89dd0acf3d86 --- /dev/null +++ b/pkgs/by-name/ed/edopro/package.nix @@ -0,0 +1,318 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchzip, + makeWrapper, + premake5, + writeShellScriptBin, + runCommandLocal, + symlinkJoin, + imagemagick, + bzip2, + curl, + flac, + # Use fmt 10+ after release 40.1.4+ + fmt_9, + freetype, + libevent, + libgit2, + libGL, + libGLU, + libjpeg, + libpng, + libvorbis, + libX11, + libxkbcommon, + libXxf86vm, + lua5_3, + mono, + nlohmann_json, + openal, + SDL2, + sqlite, + wayland, + egl-wayland, + covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg", + fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png", + # While ygoprodeck has higher quality images, "spamming" of their api results in a ban. + # Thats why this link can change since it's compiled into the program, However it will + # download assets when needed so it is unlikely to get banned. Unless you search the + # card list with no filters of any kind. When testing use ProjectIgnis' website instead. + pics_url ? "https://images.ygoprodeck.com/images/cards/{}.jpg", +}: +let + archLabel = + { + "x86_64-linux" = "x64"; + "aarch64-linux" = "arm64"; + } + .${stdenv.hostPlatform.system} + or (throw "${stdenv.hostPlatform.system} is an unsupported arch label for edopro"); + + deps = import ./deps.nix; +in +let + assets = fetchzip { + url = "https://github.com/ProjectIgnis/edopro-assets/releases/download/${deps.edopro-version}/ProjectIgnis-EDOPro-${deps.edopro-version}-linux.tar.gz"; + hash = deps.assets-hash; + }; + + irrlicht-edopro = stdenv.mkDerivation { + pname = "irrlicht-edopro"; + version = deps.irrlicht-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "irrlicht1-8-4"; + rev = deps.irrlicht-rev; + hash = deps.irrlicht-hash; + }; + + buildInputs = [ + libGLU + libX11 + libxkbcommon + libXxf86vm + wayland + ]; + + enableParallelBuilding = true; + buildFlags = [ + "NDEBUG=1" + ]; + makeFlags = [ + "-C" + "source/Irrlicht" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,include} + cp lib/Linux/libIrrlicht.a $out/bin + cp -r include/* $out/include + + runHook postInstall + ''; + }; + + ocgcore = stdenv.mkDerivation { + pname = "ygopro-core"; + version = deps.ocgcore-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "ygopro-core"; + rev = deps.ocgcore-rev; + hash = deps.ocgcore-hash; + fetchSubmodules = true; + }; + + patches = [ + ./ocgcore-lua-symbols.patch + ]; + + nativeBuildInputs = [ premake5 ]; + + buildInputs = [ lua5_3 ]; + + preBuild = '' + premake5 gmake2 \ + --lua-path="${lua5_3}" + ''; + + enableParallelBuilding = true; + buildFlags = [ + "verbose=true" + "config=release" + "ocgcoreshared" + ]; + makeFlags = [ + "-C" + "build" + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/lib bin/release/libocgcore${stdenv.hostPlatform.extensions.sharedLibrary} + + runHook postInstall + ''; + }; + + edopro = stdenv.mkDerivation { + pname = "edopro"; + version = deps.edopro-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "edopro"; + rev = deps.edopro-rev; + hash = deps.edopro-hash; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + makeWrapper + premake5 + ]; + + buildInputs = [ + bzip2 + curl + flac + fmt_9 + freetype + irrlicht-edopro + libevent + libgit2 + libjpeg + libpng + libvorbis + lua5_3 + nlohmann_json + ocgcore + openal + SDL2 + sqlite + ]; + + # nixpkgs' gcc stack currently appears to not support LTO + postPatch = '' + substituteInPlace premake5.lua \ + --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"' + ''; + + preBuild = '' + premake5 gmake2 \ + --architecture=${archLabel} \ + --covers=\"${covers_url}\" \ + --fields=\"${fields_url}\" \ + --pics=\"${pics_url}\" \ + --prebuilt-core="${lib.getLib ocgcore}/lib" \ + --sound=sfml + ''; + + enableParallelBuilding = true; + env = { + # remove after release 40.1.4+ + # https://discord.com/channels/170601678658076672/792223685112889344/1286043823293599785 + CXXFLAGS = "-include cstdint"; + LDFLAGS = "-I ${irrlicht-edopro}/include -L ${irrlicht-edopro}/bin"; + }; + buildFlags = [ + "verbose=true" + "config=release_${archLabel}" + "ygopro" + ]; + makeFlags = [ + "-C" + "build" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp bin/${archLabel}/release/ygopro $out/bin + wrapProgram $out/bin/ygopro \ + --prefix PATH : ${lib.makeBinPath [ mono ]} \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + libX11 + libxkbcommon + libXxf86vm + sqlite + wayland + egl-wayland + ] + } + + runHook postInstall + ''; + }; + + edopro-script = + let + assetsToCopy = lib.concatStringsSep "," [ + # Needed if we download files from ProjectIgnis' website or any https only website. + "cacert.pem" + "config" + "deck" + "COPYING.txt" + "expansions" + "lflists" + "notices" + "puzzles" + "fonts" + "script" + "skin" + "sound" + "textures" + "WindBot" + ]; + in + writeShellScriptBin "edopro" '' + set -eu + EDOPRO_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro" + + if [ ! -d $EDOPRO_DIR ]; then + mkdir -p $EDOPRO_DIR + cp -r --no-preserve=all ${assets}/{${assetsToCopy}} $EDOPRO_DIR + chmod -R go-rwx $EDOPRO_DIR + + rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in + fi + + exec ${edopro}/bin/ygopro -C $EDOPRO_DIR $@ + ''; + + edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } '' + cp ${assets}/config/io.github.edo9300.EDOPro.desktop.in desktop-template + + sed '/Path=/d' -i desktop-template + sed 's/Exec=.*/Exec=EDOPro/' -i desktop-template + sed 's/Icon=.*/Icon=EDOPro/' -i desktop-template + + install -D desktop-template $out/share/applications/io.github.edo9300.EDOPro.desktop + ''; +in +symlinkJoin { + name = "edopro-application-${deps.edopro-version}"; + version = deps.edopro-version; + paths = [ + edopro-script + edopro-desktop + ]; + + postBuild = '' + mkdir -p $out/share/icons/hicolor/256x256/apps/ + ${imagemagick}/bin/magick \ + ${assets}/textures/AppIcon.png \ + -resize 256x256 \ + $out/share/icons/hicolor/256x256/apps/EDOPro.png + ''; + + passthru.updateScript = ./update.py; + + meta = { + description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client"; + homepage = "https://projectignis.github.io"; + changelog = "https://github.com/edo9300/edopro/releases"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + OPNA2608 + redhawk + ]; + mainProgram = "edopro"; + # This is likely a very easy app to port if you're interested. + # We just have no way to test on other platforms. + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/ed/edopro/update.py b/pkgs/by-name/ed/edopro/update.py new file mode 100755 index 000000000000..05976976773d --- /dev/null +++ b/pkgs/by-name/ed/edopro/update.py @@ -0,0 +1,119 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python -p nix-prefetch-github python3Packages.githubkit +import json +import subprocess + +from githubkit import GitHub, UnauthAuthStrategy +from githubkit.versions.latest.models import ( + Commit, + ContentSubmodule, + Tag, +) + +DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix" + +with GitHub(UnauthAuthStrategy()) as github: + edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0] + + ocgcore_submodule: ContentSubmodule = github.rest.repos.get_content( + "edo9300", "edopro", "ocgcore" + ).parsed_data + + ocgcore: Commit = github.rest.repos.get_commit( + "edo9300", "ygopro-core", ocgcore_submodule.sha + ).parsed_data + + # This dep is not versioned in anyway and is why we check below to see if this is a new version. + irrlicht: Commit = github.rest.repos.list_commits( + "edo9300", "irrlicht1-8-4" + ).parsed_data[0] + + irrlicht: Commit = github.rest.repos.get_commit( + "edo9300", "irrlicht1-8-4", "7edde28d4f8c0c3589934c398a3a441286bb7c22" + ).parsed_data + + +edopro_working_version: str = "" +try: + with open(DEPS_PATH, "r") as file: + for line in file.readlines(): + if "edopro-version" in line: + edopro_working_version = line.split('"')[1] +except FileNotFoundError: + print("Error: Dep file not found.") + exit(2) + +if edopro_working_version == "": + print("Working version is unbound") + exit(5) + +if edopro_working_version == edopro.name: + print("Version is updated") + exit(0) + + +def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str: + args: list[str] = ["nix-prefetch-github", owner, repo, "--rev", rev] + + if submodule: + args.append("--fetch-submodules") + + out: subprocess.CompletedProcess = subprocess.run(args, capture_output=True) + out_json = json.loads(out.stdout.decode()) + + return out_json["hash"] + + +edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True) +ocgcore_hash = get_hash("edo9300", "ygopro-core", ocgcore.sha) +irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha) + +asset_legacy_hash: str = ( + subprocess.run( + [ + "nix-prefetch-url", + f"https://github.com/ProjectIgnis/edopro-assets/releases/download/{edopro.name}/ProjectIgnis-EDOPro-{edopro.name}-linux.tar.gz", + "--unpack", + ], + capture_output=True, + ) + .stdout.decode() + .strip() +) +asset_hash: str = ( + subprocess.run( + [ + "nix", + "--extra-experimental-features", + "nix-command", + "hash", + "to-sri", + "--type", + "sha256", + asset_legacy_hash, + ], + capture_output=True, + ) + .stdout.decode() + .strip() +) + + +with open(DEPS_PATH, "w") as file: + contents = f"""# This is automatically generated by the update script. +# DO NOT MANUALLY EDIT. +{{ + assets-hash = "{asset_hash}"; + edopro-version = "{edopro.name}"; + edopro-rev = "{edopro.commit.sha}"; + edopro-hash = "{edopro_hash}"; + irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}"; + irrlicht-rev = "{irrlicht.sha}"; + irrlicht-hash = "{irrlicht_hash}"; + ocgcore-version = "{"0-unstable-" + ocgcore.commit.committer.date.split("T")[0]}"; + ocgcore-rev = "{ocgcore.sha}"; + ocgcore-hash = "{ocgcore_hash}"; +}} +""" + + file.write(contents) diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix index c2d54101db63..281837fd4bd4 100644 --- a/pkgs/by-name/ei/eiwd/package.nix +++ b/pkgs/by-name/ei/eiwd/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; # override this to false if you don't want to build python3 - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # prevent the `install-data-local` Makefile rule from running; # all it does is attempt to `mkdir` the `localstatedir`. diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 273ba332e646..701052130b5d 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -2,6 +2,17 @@ "x86_64-linux": { "alpha": { "experimental": { + "candidateHashFilenames": [ + "factorio_linux_2.0.10.tar.xz" + ], + "name": "factorio_alpha_x64-2.0.10.tar.xz", + "needsAuth": true, + "sha256": "07508fc5112f95ef5d5afedea66863ea326e039bd872b772b934ed08545c399b", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.10/alpha/linux64", + "version": "2.0.10" + }, + "stable": { "candidateHashFilenames": [ "factorio_linux_2.0.9.tar.xz" ], @@ -11,17 +22,6 @@ "tarDirectory": "x64", "url": "https://factorio.com/get-download/2.0.9/alpha/linux64", "version": "2.0.9" - }, - "stable": { - "candidateHashFilenames": [ - "factorio_linux_2.0.8.tar.xz" - ], - "name": "factorio_alpha_x64-2.0.8.tar.xz", - "needsAuth": true, - "sha256": "94ea36a5b9103369df7158a8281039dd2f1d7fa7bb3a2d854c715250dd73e185", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", - "version": "2.0.8" } }, "demo": { @@ -50,6 +50,17 @@ }, "expansion": { "experimental": { + "candidateHashFilenames": [ + "factorio-space-age_linux_2.0.10.tar.xz" + ], + "name": "factorio_expansion_x64-2.0.10.tar.xz", + "needsAuth": true, + "sha256": "f7d346578c812314be8b72fbf6fd291c53d23ecc2dc6556a8948d26b3b95d71e", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.10/expansion/linux64", + "version": "2.0.10" + }, + "stable": { "candidateHashFilenames": [ "factorio-space-age_linux_2.0.9.tar.xz" ], @@ -59,21 +70,22 @@ "tarDirectory": "x64", "url": "https://factorio.com/get-download/2.0.9/expansion/linux64", "version": "2.0.9" - }, - "stable": { - "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.8.tar.xz" - ], - "name": "factorio_expansion_x64-2.0.8.tar.xz", - "needsAuth": true, - "sha256": "408eae824daa761564b1ea7b81925efe05298cbaffd120eea235341ac05a6a60", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.8/expansion/linux64", - "version": "2.0.8" } }, "headless": { "experimental": { + "candidateHashFilenames": [ + "factorio-headless_linux_2.0.10.tar.xz", + "factorio_headless_x64_2.0.10.tar.xz" + ], + "name": "factorio_headless_x64-2.0.10.tar.xz", + "needsAuth": false, + "sha256": "2d7dd212fa6f715218a5e33bad7d593af8998fa7bf7ce727343159ee1f8c23f4", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.10/headless/linux64", + "version": "2.0.10" + }, + "stable": { "candidateHashFilenames": [ "factorio-headless_linux_2.0.9.tar.xz", "factorio_headless_x64_2.0.9.tar.xz" @@ -84,18 +96,6 @@ "tarDirectory": "x64", "url": "https://factorio.com/get-download/2.0.9/headless/linux64", "version": "2.0.9" - }, - "stable": { - "candidateHashFilenames": [ - "factorio-headless_linux_2.0.8.tar.xz", - "factorio_headless_x64_2.0.8.tar.xz" - ], - "name": "factorio_headless_x64-2.0.8.tar.xz", - "needsAuth": false, - "sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.8/headless/linux64", - "version": "2.0.8" } } } diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix index a1989988b4f5..d47bff2b72cc 100644 --- a/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/pkgs/by-name/fa/fanbox-dl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-EO1J90uH2J8EI51qGzIQyl4BbSwijkEi5ZQENgSMEm8="; + hash = "sha256-JARIY6z912XDvZ6JviLMP8OZLOIzUPLuJtWGpKcqwvY="; }; - vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U="; + vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA="; # pings websites during testing doCheck = false; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 5d1f54b8261e..e5ec0ed52a09 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.27.1"; + version = "2.28.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-N/C6vGNebOFQ5RRpHD2hTqvHbX5mwICqIeFsdSCjaR4="; + hash = "sha256-fkAtBO9POd3JKNNt0jV1ufIN1s8HaFW7P2+32cRycWs="; }; outputs = [ diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix index 5da5b3a1c3bb..ea331f178fd1 100644 --- a/pkgs/by-name/fo/folio/package.nix +++ b/pkgs/by-name/fo/folio/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "folio"; - version = "24.11"; + version = "24.12"; src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; rev = version; - hash = "sha256-55zNxZbta12T/N6ruzY+/FVlinVMYcE02C48nTQUeO4="; + hash = "sha256-0Aq8R+5k5LCmciRHauTvxuJWCyN3FN4sP9aEPNlMn+k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index c0a321858f0e..444f916bb7be 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -28,7 +28,7 @@ buildGo123Module rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' make manpage installManPage share/man/man1/* installShellCompletion --cmd glab \ diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index f4b03a4b8d27..a6c5f54f814e 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -8,12 +8,12 @@ }: let - version = "0.23.0"; + version = "0.25.0"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-X9XXQ/Ke3toXLIkSCzGrypd1lKDfslpJ96zmDHBDbl8="; + hash = "sha256-456kMO7KappYI2FuHA8g+uhkJNCGCxb/9zmleZqu6SQ="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -21,7 +21,7 @@ let src = gitSrc; - npmDepsHash = "sha256-9BicZfnrJEFrtaJ0uGmLnnY99KplnL8qdmG5FMo70uI="; + npmDepsHash = "sha256-XKPFT8eyZmDhNbuCpTzGYeg5QdhgpVhHkj8AGSlh6WU="; dontNpmInstall = true; @@ -41,7 +41,7 @@ in buildGo123Module rec { src = gitSrc; - vendorHash = "sha256-xpN/5VmRPFQegP+ORpb875N/+AKgxiqyZWk4Px+SCZ4="; + vendorHash = "sha256-oly6SLgXVyvKQQuPrb76LYngoDPNLjTAs4gWCT3/kew="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index d872cd796042..1cb5cfa9efc4 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -27,11 +27,11 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "got"; - version = "0.103"; + version = "0.104"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg="; + hash = "sha256-sy14eSC8SXUhOVoGvrB9f0+StpN5WGMiS2BJ09ZpyMk="; }; nativeBuildInputs = [ pkg-config bison ] diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index e465a4f66eba..9c8da64480b2 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -16,17 +16,17 @@ buildGoModule rec { pname = "grafana-alloy"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "alloy"; - hash = "sha256-/LCp4PUt85HR+ig0/v7KlS1cFcFGpI8TXHk3IlcEkvk="; + hash = "sha256-ISSmTdX/LgbreoGJry33xdOO9J98nh8SZBJwEFsFyvY="; }; proxyVendor = true; - vendorHash = "sha256-fhUoQGNRoWNbU5U21X45s+eJ8XjCkvYULTRShyq0f3E="; + vendorHash = "sha256-O7x71Ghd8zI2Ns8Jj/Z5FWXKjyeHaPD8gyNmpwpIems="; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs installShellFiles ]; @@ -62,7 +62,7 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; - hash = "sha256-Y0WcmjFtiNXue2kcJGlvHVBGmMLewGICISoRHnBPHGw="; + hash = "sha256-Q4IrOfCUlXM/5577Wk8UCIs76+XbuoHz7sIEJJTMKc4="; }; preBuild = '' diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/by-name/gu/gummy/package.nix similarity index 82% rename from pkgs/tools/misc/gummy/default.nix rename to pkgs/by-name/gu/gummy/package.nix index 628d5e9e7d16..2b34d02d5b0a 100644 --- a/pkgs/tools/misc/gummy/default.nix +++ b/pkgs/by-name/gu/gummy/package.nix @@ -14,18 +14,19 @@ , fmt , nlohmann_json , spdlog +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "gummy"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fusco"; repo = "gummy"; rev = finalAttrs.version; - hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE="; + hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ="; }; nativeBuildInputs = [ @@ -46,8 +47,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DUDEV_DIR=${placeholder "out"}/lib/udev" - "-DUDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" + (lib.mapAttrsToList lib.cmakeFeature { + "UDEV_DIR" = "${placeholder "out"}/lib/udev"; + "UDEV_RULES_DIR" = "${placeholder "out"}/lib/udev/rules.d"; + }) ]; # Fixes the "gummy start" command, without this it cannot find the binary. @@ -65,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://codeberg.org/fusco/gummy"; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/by-name/he/helm/package.nix similarity index 54% rename from pkgs/applications/audio/helm/default.nix rename to pkgs/by-name/he/helm/package.nix index b6331fd21392..c5b4dd4ce564 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/by-name/he/helm/package.nix @@ -1,54 +1,73 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, xorg -, freetype -, alsa-lib -, curl -, libjack2 -, lv2 -, pkg-config -, libGLU -, libGL +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + xorg, + freetype, + alsa-lib, + curl, + libjack2, + lv2, + pkg-config, + libGLU, + libGL, }: - stdenv.mkDerivation { - version = "0.9.0"; +stdenv.mkDerivation (finalAttrs: { pname = "helm"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mtytel"; repo = "helm"; - rev = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e"; - sha256 = "17ys2vvhncx9i3ydg3xwgz1d3gqv4yr5mqi7vr0i0ca6nad6x3d4"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-pI1umrJGMRBB3ifiWrInG7/Rwn+8j9f8iKkzC/cW2p8="; }; buildInputs = [ - xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext - xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsa-lib curl libjack2 libGLU libGL lv2 + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXext + xorg.libXinerama + xorg.libXrender + xorg.libXrandr + freetype + alsa-lib + curl + libjack2 + libGLU + libGL + lv2 ]; nativeBuildInputs = [ pkg-config ]; - CXXFLAGS = "-DHAVE_LROUND"; + CXXFLAGS = [ + "-DHAVE_LROUND" + "-fpermissive" + ]; enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; patches = [ # gcc9 compatibility https://github.com/mtytel/helm/pull/233 (fetchpatch { url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch"; - sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk"; + hash = "sha256-s0eiE5RziZGdInSUOYWR7duvQnFmqf8HO+E7lnVCQsQ="; }) ]; - prePatch = '' - sed -i 's|usr/||g' Makefile - sed -i "s|/usr/share/|$out/share/|" src/common/load_save.cpp + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "usr/" "" + + substituteInPlace src/common/load_save.cpp \ + --replace-fail "/usr/share/" "$out/share/" ''; - meta = with lib; { - homepage = "http://tytel.org/helm"; + meta = { + homepage = "https://tytel.org/helm"; description = "Free, cross-platform, polyphonic synthesizer"; longDescription = '' A free, cross-platform, polyphonic synthesizer. @@ -68,8 +87,11 @@ Effects: Formant filter, stutter, delay ''; license = lib.licenses.gpl3Plus; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + magnetophon + bot-wxt1221 + ]; + platforms = lib.platforms.linux; mainProgram = "helm"; }; -} +}) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 9c7799fa9dc7..1c0a2225ef86 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -9,19 +9,19 @@ wayland-protocols, wayland-scanner, hyprlang, - sdbus-cpp, + sdbus-cpp_2, systemd, }: stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hypridle"; rev = "v${finalAttrs.version}"; - hash = "sha256-4EgQyprji92cmhGaQQsw6eN6cmEkQKs0+MeD7YLgHlg="; + hash = "sha256-20a3pg94dyLFflbBIN+EYJ04nWfWldTfd2YmB/rcrqY="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ hyprlang hyprutils - sdbus-cpp + sdbus-cpp_2 systemd wayland wayland-protocols diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 2e4ad286a1a0..e8d0a11330f8 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -19,7 +19,7 @@ python3, jansson, curl, - fmt_8, + fmt, nlohmann_json, yara, rsync, @@ -97,7 +97,7 @@ stdenv'.mkDerivation (finalAttrs: { curl dbus file - fmt_8 + fmt glfw3 gtk3 jansson diff --git a/pkgs/by-name/ja/jalv/package.nix b/pkgs/by-name/ja/jalv/package.nix new file mode 100644 index 000000000000..f801039fb069 --- /dev/null +++ b/pkgs/by-name/ja/jalv/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, + libjack2, + lilv, + lv2, + meson, + ninja, + pkg-config, + portaudio, + serd, + sord, + sratom, + suil, + wrapGAppsHook3, + useJack ? true, + useQt ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jalv"; + version = "1.6.8"; + + src = fetchFromGitHub { + owner = "drobilla"; + repo = "jalv"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-MAQoc+WcuoG6Psa44VRaZ2TWB2LBpvf6EmqbUZPUf38="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ] ++ lib.optionals (!useQt) [ wrapGAppsHook3 ] ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ]; + + buildInputs = + [ + lilv + lv2 + portaudio + serd + sord + sratom + suil + ] + ++ lib.optionals (!useJack) [ portaudio ] + ++ lib.optionals useJack [ libjack2 ] + ++ lib.optionals useQt [ libsForQt5.qtbase ]; + + mesonFlags = [ + (lib.mesonEnable "portaudio" (!useJack)) + (lib.mesonEnable "jack" useJack) + (lib.mesonEnable "gtk2" false) + (lib.mesonEnable "gtk3" (!useQt)) + (lib.mesonEnable "qt5" useQt) + ]; + + meta = { + description = "Simple but fully featured LV2 host for Jack"; + homepage = "http://drobilla.net/software/jalv"; + license = lib.licenses.isc; + mainProgram = if useQt then "jalv.qt5" else "jalv.gtk3"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/by-name/ja/janus-gateway/package.nix similarity index 55% rename from pkgs/servers/janus-gateway/default.nix rename to pkgs/by-name/ja/janus-gateway/package.nix index 9a0ecad23dd4..dadd67e735cf 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/by-name/ja/janus-gateway/package.nix @@ -1,7 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt -, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv -, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus -, usrsctp, ffmpeg +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + gengetopt, + glib, + libconfig, + libnice, + jansson, + boringssl, + zlib, + srtp, + libuv, + libmicrohttpd, + curl, + libwebsockets, + sofia_sip, + libogg, + libopus, + usrsctp, + ffmpeg, }: let @@ -15,20 +34,38 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc="; + sha256 = "sha256-oUX9PxiNdmrC03p+DAGkxD+mbi2jzuCgwlgd2JZ4Gwo="; }; - nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gengetopt + ]; buildInputs = [ - glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd - curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg + glib + libconfig + libnice + jansson + boringssl + zlib + srtp + libuv + libmicrohttpd + curl + libwebsockets_janus + sofia_sip + libogg + libopus + usrsctp + ffmpeg ]; enableParallelBuilding = true; @@ -44,9 +81,17 @@ stdenv.mkDerivation rec { makeFlags = [ "BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib" + # Linking with CXX because boringssl static libraries depend on C++ stdlib. + # Upstream issue: https://www.github.com/meetecho/janus-gateway/issues/3456 + "CCLD=${stdenv.cc.targetPrefix}c++" ]; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; postInstall = '' moveToOutput share/janus "$doc" diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 42176134371b..3eb4cce16f5d 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -12,18 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "kakoune-lsp"; - version = "17.1.2"; + version = "18.0.2"; src = fetchFromGitHub { owner = "kakoune-lsp"; repo = "kakoune-lsp"; rev = "v${version}"; - hash = "sha256-NZDp98Ne6z7DlJ2vZiqGzw5ukusOkEjb+eyvmxB+IKI="; + hash = "sha256-nfPc0ccEk+szaTJby56iMmydcDKDq/t1o8tw24c7MfY="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-QonOqdcdp1vbxzLnF46X0DLVay2Up1LvHZ/ZZ04LqlE="; + cargoHash = "sha256-nISlApNLitwLhRovjPDep6ObOfZ1bk5QWJ/j2xjJxuU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index e4537313413f..d1b62fc29aae 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -1045,8 +1045,8 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": { - "pom": "sha256-DhiM4cMSP5VblKXKW1jG4GXihQT0aApwC+ZdUQfrFGc=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": { + "pom": "sha256-+aUsGbpqYxZ/gnuysLo8caiIRbUNYy7CFO8j09D+NAE=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", @@ -1707,13 +1707,13 @@ "module": "sha256-X8dNSe1IImBLtiMbgqZoSnycSi5TAsB5SFbcnqL/4PA=", "pom": "sha256-WjUR8QbYW0UjQSY4346LURnS6EQCbRG1hzpqlenq8xA=" }, - "com/microsoft/signalr#signalr/8.0.8": { - "jar": "sha256-5pQWQ7AtKPuEGNQfsa9FftAZq9NpM2EIjZ/h1hzWXjs=", - "pom": "sha256-9G8bpHX16l3sHtG4mkV8yYGskuVleum0pUx5bwaQNQI=" + "com/microsoft/signalr#signalr/8.0.10": { + "jar": "sha256-mI7x2yzYbu4935tvt6Tj2PH0e6K+lKOYIzteCTpjuF8=", + "pom": "sha256-C+qG0/ymoU3odX9NWp6CVTOj4J+pxATItLJ866v8aKA=" }, - "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.8": { - "jar": "sha256-zlrZy8K6EcgkkfXs3k2BNa4i2qTB3o507ThUakTGKN8=", - "pom": "sha256-BCJCMKiI6uFFcmsd5dHeHmxx0H6Ew2Ol5eKFQuDXPzE=" + "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.10": { + "jar": "sha256-n+Snsmlp783g7D9Pr6WsNzNrYUl8e/zMqebbnhUHV50=", + "pom": "sha256-dRkpAi42IS1Ys6CcI7MND69ltlElqUxOz9Sgw0R8q4E=" }, "com/nulab-inc#zxcvbn/1.9.0": { "jar": "sha256-OO+uurCRROsfTUyf9lDnnfh1qNbEU5wQWweaYGu32zQ=", @@ -2610,267 +2610,267 @@ "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3": { "jar": "sha256-lzcRGdyeJgTqeMVDMwf/DxRy6IYt19/vXK3ob0IW7co=", - "module": "sha256-s1NkHzy88bsIMGsECZzVXdjLCEbeph/VfHZKPcHPagY=", - "pom": "sha256-aw2RW/tuu1gsmq33twU+W68zvMcwxFr6cCaaz6sv5AA=" + "module": "sha256-5JuLch7lfaXG+S0aivzDvCcuJblDHcJWwSrrawMhurE=", + "pom": "sha256-52FqxzlaU7v36UnOhS7Rr0Bzk5+NwhxY9O/1meAWkMY=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3": { "jar": "sha256-weUaJG5p4jfofSib4Ivr2NQG/+n/YKEl6PIHLbYRmWY=", - "module": "sha256-jB8h9qz1Duyh0bJEubt8E0XpoL/iZ8lTj9xnRr6DaME=", - "pom": "sha256-oi/mutH7OYytvY5RoJPUu4mvICT4KBo32xWGdpnuS3s=" + "module": "sha256-ftq2glUQ+28CDc0pDS5Z5EZpYM55g9j+0arRwcwlOgU=", + "pom": "sha256-3oQAyt0q08lXhEGdyH+sNu8E2tFIGCQmKtuTB0ksmGk=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3": { "jar": "sha256-vKChLI38r39zQPaueEeHVboKrLX9Amzaqu0ETR6i0dM=", - "module": "sha256-4g+/7uNPpLogIgjFh1r+BZsFEWPgPJtC6A/mWSxJzhM=", - "pom": "sha256-AZ0y7f4f6NMsxLBZFWJc+IUdP0CahY08FX9/KsP4Ae0=" + "module": "sha256-G5XG+23rwAEIPjOJRd5yxUe2ZSDxEY5G3XsuarqZhqE=", + "pom": "sha256-6rBzZerUBu/WAlH50jaJfSkFOjnQZ3OvkdjAdMGTBJY=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3": { "jar": "sha256-oFTwYuKeqeEbC/wOcjyMMmHxM61wv9e2SYvLVqakFxE=", - "module": "sha256-O45TsaRsz2Ugsf+jF9xRaLgmgFoNCi+wUfmNmlfC+iE=", - "pom": "sha256-RhCbjUL5LbukHLxCbP6XPPFmZ89ljPE8P/8xn/nBAtY=" + "module": "sha256-0GDrglEvHdCEbcJabjvoR5y7uI7XbuW4KOldzTXH6R8=", + "pom": "sha256-afzhSdyS2GswVk4ZAdZDNQWi/9ATIDxEj7FNQUBQJlE=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3": { "jar": "sha256-aFRIUvdm0yJNbF4MfGG4Pg1xUGOvM6JtVu5iaIco37w=", - "module": "sha256-IlPYvswJR77h3Bk5IA7qN9/Vb1rKy1lgUH9MQgzXOG8=", - "pom": "sha256-pMbbdwNPwAzb1D00BkOAlluIFbLR2uuGgHo/Om9B6n8=" + "module": "sha256-C97hP9XDeEeYwpHraD2vz6sWQEA0nn6t2SOLo9XTKIE=", + "pom": "sha256-+LCPTAjUufxBcNjR+aIDEpGk0K9yzodSLPwsl5LMANo=" }, - "org/jetbrains/compose#compose-gradle-plugin/1.7.0-rc01": { - "jar": "sha256-bvxr0H9YF4MAEnxcv0COfkn//9WrDwSjRvIP7bfiNJs=", - "module": "sha256-ED6ebSTwIXal5ECkHea+Yst5Sa8ZRMJZMxnNLWW3PoM=", - "pom": "sha256-DNBQFbYoWKmAMKbcvoE29PNr9SiJKt1Qj5lg9yIg+DQ=" + "org/jetbrains/compose#compose-gradle-plugin/1.7.0": { + "jar": "sha256-F7ch4W8bXBAaduFvbz0rw//+rit5zD759BhW7Y7B85I=", + "module": "sha256-BgNU2R7hwMVPCgs8GjzutD7Uv8qjm7O9JgbbhYaragg=", + "pom": "sha256-o+Zmvd7k+urvSEO7TZET2yxjKpeX3TjuHUYa8lk1H2g=" }, - "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0-rc01": { - "jar": "sha256-hwY7ymKmu3QYPx6lTUquicbq85uNmRXWhbP13KQ9w8M=", - "module": "sha256-UIF0Jv7rrPUqYtOiABDiBgNcHxtWnv6dyddm7JuLcxI=", - "pom": "sha256-mVJyA8/us/F3Ducx+Mt/7Lghu3vvTuGQJHNokw6QPI4=" + "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0": { + "jar": "sha256-IV3fOk357eYF4cgjSA6zkOZK47RCh9MGyYvUD/iaYuQ=", + "module": "sha256-j86qapHAzzYaZkd/j1+SVfEMbglErzABHeJYSuoohz4=", + "pom": "sha256-JuhmPnnXa/BIj8w/JeFK/poQlJlAPu4vKrlvu+z0WnM=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": { - "pom": "sha256-yH0dLbJbKFf7k8/J3UlEjiinHuVcBQF66r7e/l4Sz0Q=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": { + "pom": "sha256-9vpXaz9lXUXmgnqrC0sOaMOXr4hr/axkcd9jacqecu8=" }, - "org/jetbrains/compose/animation#animation-core-desktop/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-core-desktop/1.7.0": { "jar": "sha256-SbWk6POl6EcCRQMlwBdWiNVcShKXPPwaGjbmTxj9+NU=", - "module": "sha256-RYbeapNWeBBUb4zo4ffgAwPyc3CFBYPWoI6izwiTAoo=", - "pom": "sha256-XJi0WxWJ4gYJiTJwXexx4NqqN4SqrrAvKPTEN6lt8+k=" + "module": "sha256-dUjThL4ILmK3T835lfj78lJcrMtGEU17H/zkIAO5Glw=", + "pom": "sha256-up2FWwjkrEa8OaiVih2ummFqQwTiyoVwiVsileelCAU=" }, - "org/jetbrains/compose/animation#animation-core/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-core/1.7.0": { "jar": "sha256-ln8031R8dRUQ4aeez1B/KpkP4soFTJ7IVhEI1rzvS58=", - "module": "sha256-vp3LogRf1hTHeaQiYiIMTJWHxTD/HRHlsX2DIUch9xk=", - "pom": "sha256-Q6JVlvPmaASXAHUBsXTNL26sXi3Hd5Dn5fZvUXD/8D0=" + "module": "sha256-NP5zUz8vp9by6JeWNiLDdvWYLrpGkvW+1zNK1K+HcQc=", + "pom": "sha256-0PJC/klRLsOP3UEzWbLdy9PIQ/+LMKhV8zO9Op+wPLQ=" }, - "org/jetbrains/compose/animation#animation-desktop/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-desktop/1.7.0": { "jar": "sha256-XkDy/HvIy0IkPPp9c8YxoXs9mHSvaIQa0+93j3BmO+M=", - "module": "sha256-PJNWJ1GJcHceBH3Th2cb85ARdiv14BUDBiaveSXUPkA=", - "pom": "sha256-o3tmzL73XZYymilLLN8iulU8tDWh31wPnUnai9+x/mg=" + "module": "sha256-vkvwxfvDqIynp6tHVOhCk07URUlh8m3S+0mqF7ZhnrI=", + "pom": "sha256-FSFz0u3LvcFx4sZkYuXqlT7IkwpykPyQF5cUHoXFiTA=" }, - "org/jetbrains/compose/animation#animation/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation/1.7.0": { "jar": "sha256-uyegrYK2UqtzRMhFUDi2HKwUwx6CFovdgfz59apL3tI=", - "module": "sha256-nnUikVPJFi7KhzbL/sOhEJWG+7NcSppCTnly9KwmlBo=", - "pom": "sha256-F5uPmPkeUR0E8F/7KdNn/rYHEELgkXjKEw5gls0SoSA=" + "module": "sha256-kTPWeIulfh1cAk09qH+euuIvoatcwIsDD5HS4uFZdmE=", + "pom": "sha256-L//BVM1KS/txnyNExZYS7x+gCdi1DKcTfJqLGFyiru4=" }, - "org/jetbrains/compose/annotation-internal#annotation/1.7.0-rc01": { + "org/jetbrains/compose/annotation-internal#annotation/1.7.0": { "jar": "sha256-sqg9fABDcJ5TdcAeILKOvuRG87gq7EiLa6zvMFOW02E=", - "module": "sha256-IiVtV1K8/YyU8Qelizb6u6jhvjhzzstaZaPCI2Tvims=", - "pom": "sha256-Ta9/eHj/I3dZMq4sZbjFBiIcjR4p6dczxDKDczQl/r0=" + "module": "sha256-qUleTa2IlUVTYZnS6T7DUvZZkwUKVPdPRiMv2f3ymKs=", + "pom": "sha256-0oFVMe34ol4GEsYsuwZ5PTHekRdAyi8R3Lzgl6n1WYQ=" }, - "org/jetbrains/compose/collection-internal#collection/1.7.0-rc01": { + "org/jetbrains/compose/collection-internal#collection/1.7.0": { "jar": "sha256-4+BM9dHyfZujbGhkg11TUcY3ONPQL2FXmd28XB0L/AM=", - "module": "sha256-jpPZCcGPNIZ9n9L65s9IQIuDI8MVtD6gsMXANjTk5ac=", - "pom": "sha256-5u7v4NewO9uDYDhkP2QwoBuTZBkoAA1RcuIGr1kU6bA=" + "module": "sha256-PS/V3z5VZdnA4cA8XdIjYizyiRVXIIYjJKME1SL3gEc=", + "pom": "sha256-YSpPsvay2ouT3ew6D21esxF2NhE+/aOt3/tV1iUJnv8=" }, - "org/jetbrains/compose/components#components-resources-android/1.7.0-rc01": { - "module": "sha256-EQ2buHW+eOfn0WBDwEdcttYDOdMml0c3vl6sx38y4/o=", - "pom": "sha256-c4OoehM2u1yLejJIP9zVELqS5jq8u9SW3yh/GDkyJH8=" + "org/jetbrains/compose/components#components-resources-android/1.7.0": { + "module": "sha256-1w7u1mCwPnCWFQwj6EPdZXWby7w2EwD0/ooyhT6CcSQ=", + "pom": "sha256-pIG3PAFB7EJjfzbXyesFyrJSUR6mhEFafpm7Oo7QTbM=" }, - "org/jetbrains/compose/components#components-resources-desktop/1.7.0-rc01": { + "org/jetbrains/compose/components#components-resources-desktop/1.7.0": { "jar": "sha256-FYS3Oejxhp5PNAUZ3JhNSkRYKoDvMj5lWZndsY3ZVMI=", - "module": "sha256-vqnjWi83+RW2BNJUanZwcNbq7Uf3ttIyhsQWKuz0jXw=", - "pom": "sha256-3jPhAW6Rn/sihFLkYVCrBjHU9EuUlrLEFALhYGrp5m8=" + "module": "sha256-EzcdzRsTOPruGm88RmUXgHfMpKQV4tI0dkmDqKzJkxg=", + "pom": "sha256-vUT3nsuxa8W9OQmbXGsMZ80C0aa+UJFDhBeUxWIxXRM=" }, - "org/jetbrains/compose/components#components-resources/1.7.0-rc01": { + "org/jetbrains/compose/components#components-resources/1.7.0": { "jar": "sha256-ArSt70Ju6JvXt9YaMmO09jW/eDbEjMuvJo25Ay+OAdI=", - "module": "sha256-cbuIM07Qg6ipU5WkFIuhe7qsNpMEWuYnpuEYRJzpoBA=", - "pom": "sha256-ThIGyeMgztgz2PeJoWcddYuD0kcj04UfUC4C+b/N/tc=" + "module": "sha256-SwnDQyZRdrenG7ChlMQpwhfOxF+Ncy9oZLtVuiJlJ8Q=", + "pom": "sha256-k40+o5fKQkmfjPSMySntJf2Zwp4E3tgWiT6ct8yN46w=" }, - "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0-rc01": { - "pom": "sha256-oeRfB7rF+Y34Cm6WYQpYZQOEJHRLg/ke13S2hCOZkIk=" + "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0": { + "pom": "sha256-2/9VPqXxybksnQwdoeEr983HeciyDY+m/CotdzXJpnY=" }, - "org/jetbrains/compose/desktop#desktop-jvm/1.7.0-rc01": { + "org/jetbrains/compose/desktop#desktop-jvm/1.7.0": { "jar": "sha256-YsgWBzGVzAEZ3B1msXhUS9t3Lvi+5IeZVFKMZ5ixfr4=", - "module": "sha256-CqUZiGcmcUdTPbrHXg68EZXDG3ERbEWeSo7yqVqgb1Q=", - "pom": "sha256-kYpR7OweckYnsGA2rHE6bnGpSLaUrY/jnIZkZUefn/w=" + "module": "sha256-Fl1IccnE3fepQGDfGDhdfsuzzefe543VqcfoC50GzZY=", + "pom": "sha256-Yh0NwEq1O74WPK6jTcSTGtMLjdSGLaJiqcacwBwnRPI=" }, - "org/jetbrains/compose/desktop#desktop/1.7.0-rc01": { - "module": "sha256-T+nDnbGj/OtkSyr78WPdVrfNHSGk4tY8ZjPPZI71Db4=", - "pom": "sha256-lqgkWE0NhMRi4FzAe5LJkuwNmAAkMonblgm+wBnlemI=" + "org/jetbrains/compose/desktop#desktop/1.7.0": { + "module": "sha256-MoK+qppv1rF8cjwisP+buHTi+Pvyu6B05D06P0FA8zc=", + "pom": "sha256-DidG/5FAzfY6or6Fzp40ciEZpGqfjaxzmrfmd++PRB8=" }, - "org/jetbrains/compose/foundation#foundation-desktop/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-desktop/1.7.0": { "jar": "sha256-nHUjEw15XuzenL87rqBNMOVnzRG3nnPT2ozgMdiyVug=", - "module": "sha256-LSNstwbX4aMzmBiC86z5YU6lqzxRXS4Ue+rViF4AGNk=", - "pom": "sha256-kbOPkdy5tLAroxFOja4HkmJLqovlvmj7C+sP4FN6ab0=" + "module": "sha256-KAvYX2tc6qK0ZjsNCQW+BBBuene86+Levy9YUOyhXaM=", + "pom": "sha256-eIJ76xavjp63Q9mdsGwvNFdPchxM5wiZZk+1gqFJfgI=" }, - "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0": { "jar": "sha256-0shnwT/2Yy+YgOZ9q6sukwAHsAi5silQ/CzAdQCOzrY=", - "module": "sha256-ArK7GVO7OP7fULNoQZv7o1gYaBed7qRZ9ElQ2QuDYv0=", - "pom": "sha256-soxkTIbRU5XYGXNdRLXJ9R4UOetqHtVua0mw7OPYcC4=" + "module": "sha256-+L/EbEm87ysEcgDQVrb1+ypMxnK75yq6xEdgxw+ITHc=", + "pom": "sha256-5LnUN0tJ2iugyII9LxZT52zNwrNgMvgBlIO2GDwGQFo=" }, - "org/jetbrains/compose/foundation#foundation-layout/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-layout/1.7.0": { "jar": "sha256-QrUOJHLNXuGTKbS+FTDOc3/YT5S23mOKiXJypeK9Quk=", - "module": "sha256-4W/xyoXEZLss3kaRRGxJptukpkUWhqDXiY8fOdN0tD0=", - "pom": "sha256-n/KPOk6um1kIjeLiagUSWt8FSjUOpN2I5wD87DOT7Ws=" + "module": "sha256-v5mKtVotRpq9vDtM/FsjC6cXO6XX683caFiIHTlv9X4=", + "pom": "sha256-01z1/2PMSisctkVO8XxyOqvUdmZbiiNU4eK8vHuqCYI=" }, - "org/jetbrains/compose/foundation#foundation/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation/1.7.0": { "jar": "sha256-ELOhv9YPC28MgEeiN9M1YMvx/AIeCU1z8GxPPyhldCQ=", - "module": "sha256-On4CXwkWuAsUzqUQ9KGT1/AuH1qCsVL9nAYeXjZfHXk=", - "pom": "sha256-eebzRpd/b9orQCZ3A2VwvERZGzAMrpC9Yd3W1tDdyOY=" + "module": "sha256-dBAoLbTrKC401OCdYUGEXmnYMzyZz53EK7Zdcy6oK+g=", + "pom": "sha256-TZE4B6HjVXgvg7UKR8pfJRMSJh9sTmXO2dXlLuXPEKg=" }, - "org/jetbrains/compose/material#material-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-desktop/1.7.0": { "jar": "sha256-JCX2UAVWD2XtcyGy+CCQeeTFMIWv/INj6G6CNilE9EI=", - "module": "sha256-jU2kUQbZwzchFz/eWkDBAKGohgLUmEOldYIIkgyODEI=", - "pom": "sha256-iWncacdjxR76YmYWwdldLFR4ZK8ULcR6X8SG3A8HUcM=" + "module": "sha256-z0mlF+Gh3u9XPp2oDp8pAfqGAPFCaUcWgt8UCL3QeM4=", + "pom": "sha256-CzPMG/qial+9yYnPjOqH9FyYEg2GxQzd2sylEy6tl98=" }, - "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0": { "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", - "module": "sha256-yAV+ZSYDvUMajK4Lva6v/pi3mYWezeTrz6rWmD9TKMY=", - "pom": "sha256-A6sRbuVGTxfrOp9Ccxb1h0H+QuHOMZQ3/zCpZQIq6d0=" + "module": "sha256-JnGO9Uo/fB6pwaxLXsH/oGqsnhpv8/F7L5pbNmdtg14=", + "pom": "sha256-ngyYssNFfv3xRGpgILVsROKKdX7gXMFszf0P0d8kG6w=" }, - "org/jetbrains/compose/material#material-icons-core/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-core/1.7.0": { "jar": "sha256-3loMJ34VmMEh0sRgbMA73/69BZ4ys0lN37hMCNUdpwE=", - "module": "sha256-oGYnQ0OpNDaCC4vsc0DC7cBMtek21Th/3cmg0cxMv+I=", - "pom": "sha256-u0eiA3nxX+jrStlHCyD03RykYQ23Kq8jaZdoIqA6cpI=" + "module": "sha256-rMLAqyILaqDk4sIEqZBy6xDmMQBHKP4iOHJmDBSmEmQ=", + "pom": "sha256-C+Mv5zjA4Zh1w3VbFwTR/MtVGEda0EjvwhgE4Or3J/M=" }, - "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0": { "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=", - "module": "sha256-fJUkFx1HLSEYZqpx1J4CDEJiFQO2qp+O8IDUyoorsHA=", - "pom": "sha256-vQWIz5QZmd2pxW99KdhWMRVZfFKcyFdWi/sWaH8XqmE=" + "module": "sha256-PCQq3pH6pwW5STITE/wOR1zWPDnfwQpSM4icS/IbIco=", + "pom": "sha256-Cb230io3hD8ya1SVbY9yV4rNG76qgcODLXZ7V0Y7R7Y=" }, - "org/jetbrains/compose/material#material-icons-extended/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-extended/1.7.0": { "jar": "sha256-nnUXmWRicyD/GxtzAmklR01GX+t6idYpX40vZNxNQ6Y=", - "module": "sha256-kyKTZ4AVNk+C9/eMii+GFdkrFRqKdUG/6yCtaggKkhM=", - "pom": "sha256-NsT2Q6Ixc0xUuzCwvUj16lUZpq/KyRheLr0hj2160yU=" + "module": "sha256-t/96BSTuY06QLWhcDik95fvfT/cpwa+zAebWcdcV3V4=", + "pom": "sha256-pp8HAfEwGjtwKeIuvWsIeyrsai53MCVuy6DC6KeAy9E=" }, - "org/jetbrains/compose/material#material-ripple-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-ripple-desktop/1.7.0": { "jar": "sha256-xfa9+yKaF5SoOO0fMfcpmjtRYAS+/+GovMp1OqJovgk=", - "module": "sha256-CvZsjtNuO5pQNguAu8UwMXB2CcAJcmCWExA+Gjom7vs=", - "pom": "sha256-Vvnsc/psxp8lXdrjdBEu/pbdmrgGuQaxMxrtxGDaxbo=" + "module": "sha256-B7kC5jjctznI+4cth4H32ggofar8YFtqQzjeCb9x2fI=", + "pom": "sha256-vSRBYXCH26PSjg6Q7r6hxafI/Ihzq4HfgC7fA1/blag=" }, - "org/jetbrains/compose/material#material-ripple/1.7.0-rc01": { + "org/jetbrains/compose/material#material-ripple/1.7.0": { "jar": "sha256-k4lak+wU/hmING03mgx3S3qk0usrFPIKfTp2vVDkgbg=", - "module": "sha256-nc5BoF//ShcXCzLrFDUq4R7gEukvlIBcs4fwdgIMSf8=", - "pom": "sha256-Ep+lXHsomu7XWTbS5Z9OXfga+ojGTo/BUzeiSZJc2Rk=" + "module": "sha256-3+f+laqzsdT/a4UqAVYeW7cAHnYI2A82bBGKLwf4VcA=", + "pom": "sha256-2fXtFA8I/nzleLHGPpsbDmiQY96bsiXzd3lqSRivPVg=" }, - "org/jetbrains/compose/material#material/1.7.0-rc01": { + "org/jetbrains/compose/material#material/1.7.0": { "jar": "sha256-lp++L0SKCBxkQOiNKP8Kn8aTEYd8+FhTxfntc7jTUhs=", - "module": "sha256-u7DqOnaUTH9VWOWyLlHcBYth//4OH8Cs9cd+xFRfhuo=", - "pom": "sha256-okxn6wenYZfuCpNG7WhNzkKznsZg2TkMSpVCYfEw+5U=" + "module": "sha256-YPeQ2HDp+mhWiW756079/xM3wg0A+eyxGMKO2I3bQA8=", + "pom": "sha256-/PuHxleHr+0Z+kRiPX49FTKDsHPLpRXojeVR96G7wIs=" }, - "org/jetbrains/compose/material3#material3-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material3#material3-desktop/1.7.0": { "jar": "sha256-k+/2Ln8fmEHoqoGS6JJwO+th/QtiUBG7xbtBcIKkUSU=", - "module": "sha256-Sg/XXF1WOlaanyEMe4Q8AXPqq+Z5GSbKFlfJOtGwrlM=", - "pom": "sha256-RGUG3Xfa7woLZm1YLErWxp+OwFsHcMOq9RRruiDOtoo=" + "module": "sha256-HAWjsEfXmxXlL2sLPaxRjdx48PZh3Aay8BHoLGXN9q0=", + "pom": "sha256-PPKkVpDzATxXojGcHZ5cpRIQmPOSDABr7J9Ths6389s=" }, - "org/jetbrains/compose/material3#material3/1.7.0-rc01": { + "org/jetbrains/compose/material3#material3/1.7.0": { "jar": "sha256-Mk531GpPg+IzZBT0AfjwWss9wXAItC36HqwAmSyFI5M=", - "module": "sha256-PrvGvAuFAoFuOD/xI8FxBZeNd9oPhOU6qo+OKkKCc7Q=", - "pom": "sha256-Gk2DiWXlGt3ahDiOvDcHMXKJaDxj+XQuc4sPz4MUxUs=" + "module": "sha256-lRdR4h5adj2J3tqHe2uwVH2xCn2d/CI8fxJI5x67y0Y=", + "pom": "sha256-U5TAiRfK3SgZ5LjvSVM9JXZgATW8PLtRF4qHxJ0s8Io=" }, - "org/jetbrains/compose/runtime#runtime-desktop/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-desktop/1.7.0": { "jar": "sha256-duMlBUe5yjyxpJwnKTOyXLO8y8m6Endd1hYaY9mqfPE=", - "module": "sha256-1+RmZ/vY8kGpYVcYN+EPkhOWTa/b7sjykyJQbMzehtc=", - "pom": "sha256-y9CfKxQp8BKN5ANhqD9UVLFi9IDGxfyebCfY99XCthQ=" + "module": "sha256-ZiqUSgPejSp9CbfiWeWtnsuwtXVLlTT96Bmu8JMtyqE=", + "pom": "sha256-7Uf+L55XEcEsa80nuhngjnRo4YwEtsKzJvvu39O/5/c=" }, - "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0": { "jar": "sha256-QwY2O+kOqr50uQDbTDLtHxXHVI5bMKcJPE7kDENrm4w=", - "module": "sha256-cr/7j+sIlkzTVjFqx50Dd6z9VAcJqyzl8OCbi2rsm9o=", - "pom": "sha256-vWVnP8T2lDeM80XTHPxKbBwntpJH+kWaF253Cg5lMAo=" + "module": "sha256-i+IsKSWAu1xT1OvKUmSgp1wyhuHnHjfiu9K7BjOFMyc=", + "pom": "sha256-kUeE0ejiOF053MYSE2t28DGUVJCt8RH74f3A63JPO8o=" }, - "org/jetbrains/compose/runtime#runtime-saveable/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-saveable/1.7.0": { "jar": "sha256-mDxRgBZ4q5xRf0n5h1ld/VLveJaN5tqE5veXYqVWtn4=", - "module": "sha256-WDzBZ1wzQNiNP6MSkvFevhLhuIrzrSgV7t1id4saMc8=", - "pom": "sha256-Wx/s4MuYYCuQfbpJc3CVxXUTLC8UsEtRb/3BW3yFyT0=" + "module": "sha256-830dEuwBLS/VOcZ+iu+6NxIfRnYoUGS30ZEcbLRGdbI=", + "pom": "sha256-MPe7+pWMvZEZSt9vYnx1K5tssUAzRJIk+KLKnryZXF4=" }, - "org/jetbrains/compose/runtime#runtime/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime/1.7.0": { "jar": "sha256-XITDuxwbY2rjYDCg+Y1GKa+inhkqnHj1fyLOLI/2vJY=", - "module": "sha256-dyFNkMwOWKAxAgouIj2pGxtkKdOeM4uE64DAtg9tSVs=", - "pom": "sha256-V2Zsw9hnmsfZ8uQFye8XEc9VzzzBg7zaiCTfg/H0//Y=" + "module": "sha256-zUi/uatY5vDly8/o5Axn4ntnd2zbmWjN4IWnlhPFWe4=", + "pom": "sha256-tX39Qom2JiHOJHc4nx+BVWewBJxOmIGD9MgkO2XUTjo=" }, - "org/jetbrains/compose/ui#ui-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-desktop/1.7.0": { "jar": "sha256-suyv6mByBEYkxLZt4B1Ikf2cgLJohbA87QNszOrMDic=", - "module": "sha256-v/ZSTdddb6iuLLz8XH/GInpsNwGW6DKf7JkerXQGATI=", - "pom": "sha256-snL9R2+VvGpehXDX7e4bE8Dz9D2BTY/LvQrb06IQaX0=" + "module": "sha256-TV6orRcBQeQUghzsZ0xUR+gBIkSnj+OF61Aa36KxTHA=", + "pom": "sha256-gNOSOqqiGJwOKWqL0auC+sazT3ZusrFp7zT7VRVzVTE=" }, - "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0": { "jar": "sha256-S4bJYcC0vOeZUyn9V9Qznt4Ry3XX7JC8G5kTOWrdsw8=", - "module": "sha256-1pRVpNXjdJVGFbF1XYr8EhmErhndiUgMlp3M42y2Ghg=", - "pom": "sha256-qk/nLiiYYqNX1MilAyc01SoZWDR6ggI5EE5JiJvJ+2M=" + "module": "sha256-bNyw2SFZYEUO3WyuUWFI7MwiRqO2CFNiomCBbSJJWzk=", + "pom": "sha256-fsSL7vLrhj/TFEfA5slWtNmnq3vGdOA3Mw9oBQtZRz8=" }, - "org/jetbrains/compose/ui#ui-geometry/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-geometry/1.7.0": { "jar": "sha256-UPK8AERD9Pnvdfc4MOel6O8PB+VM9cR4p6q5xUAiVbM=", - "module": "sha256-274k9tBmxfeK+Z3+06wmnZuEbo2q56srCAU35q9h+j0=", - "pom": "sha256-hY6EBF7fboMxaEuUWXMt/nhgTwgdebwfATMoeoiykXc=" + "module": "sha256-FMOoC5/cUWvQMDAASGT7twMe/WVHYqtkF20LBj+cqUw=", + "pom": "sha256-QZsfystvNZCc+3voBwlNVjSQVri3Y9fN7W53EFGJ2NE=" }, - "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0": { "jar": "sha256-T7cOhyevDG4NRNj0v/ZduTQqlceZahgImP7XFxZ4fbg=", - "module": "sha256-FhhaeZVW5gWEEQdiLHs6vhLrk9GYv95/fCyQMxD+j5M=", - "pom": "sha256-/vboXilQor+eGL+TYv2FrePxDn3CB1/1z6bWph5GMZA=" + "module": "sha256-iWWfOKlCpyNVehbNgtn4ctWFAiAblV8x3pWfTQeiau0=", + "pom": "sha256-f6b2IRLSDeHL3q7VDpCR78eb+BmB6RAWuZmIVs6VtKw=" }, - "org/jetbrains/compose/ui#ui-graphics/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-graphics/1.7.0": { "jar": "sha256-2KtnsO/p8bbsBSup42sNgqKKA7CYedT8C+g7ntNdenw=", - "module": "sha256-vzleESVEpZLbbxYC06+q/Zt776Tv83vsq1G6RwfCu40=", - "pom": "sha256-a9pT7eJznGrFZu+S1lFFjGyQpP560CliKPhjW40l2w4=" + "module": "sha256-NSg3gfVnVU8VJmAJFFYA09nVwW762HNFjwNV9MAmnAs=", + "pom": "sha256-4cNg3cpYhZFuZ/VvCvA/s++/ZQDxVXq+h3+5C78QHKk=" }, - "org/jetbrains/compose/ui#ui-text-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-text-desktop/1.7.0": { "jar": "sha256-gOB+TKc597YSL2PpoX5oU7lHIg7LEYD43K9BnQ5GiZY=", - "module": "sha256-YlJfMGOUP0GZ8CsD2DXBSMQaU7u6KdjmSnfkM307Byc=", - "pom": "sha256-VkQNuzYlcgr3He0kYg1xAjp306sFr0nKCHuaGctCrzc=" + "module": "sha256-9PZVvGr1y4ru+J2OiL61CRJzlbVkuRgVp80Z0/2zfQk=", + "pom": "sha256-rb2Ei969/SWsriJ297EtIza/QGdarCnDzTZIHqIA7eQ=" }, - "org/jetbrains/compose/ui#ui-text/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-text/1.7.0": { "jar": "sha256-j/miuMk7AofY+oN9WwkXkjFoy5feoa2hqNSqe7F8nxU=", - "module": "sha256-J8hk90eS75BmAVO+HSpnY3opns5AyCqFl1WZb3LyUYE=", - "pom": "sha256-+OK7AD0uDDfEVLsyLoIUyfXOskBcRWcwFVQPDlhy6Xo=" + "module": "sha256-ImJh7g6SCP5Igat+pR2e5vbz1RnBWx1rFUJb98FtWTo=", + "pom": "sha256-JNbJDk5Hb1IDxkD2sxZl7BiwIPAfLxZNz3dnVa1wYhM=" }, - "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0": { "jar": "sha256-xc+tCxJel42RX4tMOGMLxdVI5Z/ooOg4wMyEKDxgWUM=", - "module": "sha256-3stx7FZXMW21YmrSgZwqUUmu68t6B3pCax1Ea2ZrWd4=", - "pom": "sha256-ZZg7EuCBIJOqpn0V4apd15UxagBIpBXLQu9d37w4Yb4=" + "module": "sha256-v5EB4n48dWgCKkjaGOF7LdiIe4LN6dHQMjFummDH948=", + "pom": "sha256-lKYRZropAXUomq3Xtu5RSZ3l/gO/xuSCCeD9tagfHm0=" }, - "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0-rc01": { - "module": "sha256-rU2dfmzOklGPa+78Q00OV72CbkP82cTr9esy0dFLRR0=", - "pom": "sha256-jlVF/i8dHW7MiMqmZGwTfcWb0Ug7Xl80SIEmU8Kxblg=" + "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0": { + "module": "sha256-vxGYhRsMn71B1NrnhLB9W8GJ10mpeeeTPZlJ7pRDca8=", + "pom": "sha256-InPHq9mcpAqDjqEBFrZh3ETnMHv97VkeJj0UMWnvUi4=" }, - "org/jetbrains/compose/ui#ui-uikit/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-uikit/1.7.0": { "jar": "sha256-GhOzmt860nZ/ln92S6Cg0u0qLQnu8xDyLSwDBNe9pss=", - "module": "sha256-CoF+c2gCKMmt4blbqqwuFb5PtHHldun/Sh5U4OK4D2Q=", - "pom": "sha256-n3fVs6X93gCO0Y4LrJHxtWoXa1d0oWdSY9VvnW85uSE=" + "module": "sha256-VxLoIbC5bdlwAcQY7Kn//A6kabpF7ng7uJfRgBiPPyA=", + "pom": "sha256-Nreuwus6pSUI+00PJFLFTWhQUzCBQt4/VuQxeC/eXAM=" }, - "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0": { "jar": "sha256-WYtS4lftZ0FFaUuXkKc4OpD+0uxxVLoJrOSqmDxlsaI=", - "module": "sha256-SMkO45UYCnBQUkPZXBF00RBd7aMu0LdvAYH6JSpP46s=", - "pom": "sha256-ZnvHUoW6szo4GP1SdDxEOlSRYaUzKp6FCHX1MGoLcqI=" + "module": "sha256-OcvNe7cG50of60dPMyN3Yp2++MXhOXEu4UmbaPigL0Y=", + "pom": "sha256-H2Xl5/BcnA16opnEaxRn6hCZfWGjzxlpSisxMv9xQKo=" }, - "org/jetbrains/compose/ui#ui-unit/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-unit/1.7.0": { "jar": "sha256-QdpdYcVod7W10B4qK8uWfL+vTUXBoaoSTAYBx6PedOc=", - "module": "sha256-r21Xb5itOKii83kpdZVfcMp7TDwUIxL8CYGFI/qwyqM=", - "pom": "sha256-ufLkqP7L2gzGW3zT87uoOuiRFSLFZxRjEz+R54GDskc=" + "module": "sha256-gHp2IZXLdkSswLTc4hNI7S/d1BY/Sj0BqcTtHPyPdpo=", + "pom": "sha256-kHISejq/Lk2t0bxv/2fur35nvk1i7MqZmxF71+ciOaM=" }, - "org/jetbrains/compose/ui#ui-util-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-util-desktop/1.7.0": { "jar": "sha256-Fh3Mc7kp2mHO5QBF6W+wLxYzw28You84tcLETDhga1I=", - "module": "sha256-ISnvDx+9M55KCFLZZoXtIRPT6svC7N2O8cSa6IMTeUU=", - "pom": "sha256-FQFMK1TjTPCEqOHTFQHkXaDV6IsYuPTRi7XHkHub49s=" + "module": "sha256-cbDYKrQiAZ/AbpsSDyTqmSTFm8D1tc6W/iDUye8Zdmg=", + "pom": "sha256-DlkctYsmNXdtlnpyrb6aOvb8Q8db2SCodxVlE3kE+uQ=" }, - "org/jetbrains/compose/ui#ui-util/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-util/1.7.0": { "jar": "sha256-cMKLKyQxS0t3mMq2qy+v53tHyS3qIvD8Il/lx5rHn3Y=", - "module": "sha256-3MuHSqbfBu18tQh9AvXkRTZzrVIvQWPcduCg0MgkIyU=", - "pom": "sha256-+qWMzWnZ3+lY8DNRqjOFNt2VSbo8rCgF4cRyv9T0VOw=" + "module": "sha256-dnIxUWYxsugkOSHP2cFIhifjjLIEidOXNFHyagkGLtY=", + "pom": "sha256-Y4m+v3a9SXezAteFEOukGIGipqplqyP0eYJCSUDtS2M=" }, "org/jetbrains/compose/ui#ui/1.6.11": { "module": "sha256-Z5lkk+C/fOHwl4SUz9hM8kKEUQfktYcxHpO72XMLJFI=", "pom": "sha256-TfLxK8+p2L2aVwxn6OT7UlIcDmhFHAVGHFc6SUXuST0=" }, - "org/jetbrains/compose/ui#ui/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui/1.7.0": { "jar": "sha256-nyVs9/d8fUtm+Muexe4JWSAKuQvQwJ1vXtEsmQKlhPg=", - "module": "sha256-yT2jcwfka12NtpMPqB1qj7pF3qUt8DxG/OcHk0DvkOo=", - "pom": "sha256-j5PTiO+cIkJ+SJKXulobQjhc9NU9bsz92LUrbX4Dfdg=" + "module": "sha256-xb2CXBAf7xnylq2gc7yfRJidpOgoMM/03NPBfEGtfJc=", + "pom": "sha256-zXIIZEtdLIv8p5ThqA+n6Kwp3/WLidKeoDDYPxB1EOA=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 75e7e438343c..5929e48efba7 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - rev = "eb36b853a7ac67a0f72d5684e6751d41969b07dd"; - hash = "sha256-tMNc8OlYsiYmVtac2jngvrFZjgI7eNFVIxXUfIJUdK4="; + rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a"; + hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug="; }; inherit gradleBuildTask gradleUpdateTask desktopItems; diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/by-name/ko/komikku/package.nix similarity index 59% rename from pkgs/applications/graphics/komikku/default.nix rename to pkgs/by-name/ko/komikku/package.nix index 53fa2a64350a..ab59d052d4c7 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -1,25 +1,29 @@ -{ lib -, fetchFromGitea -, desktop-file-utils -, gettext -, glib -, gobject-introspection -, blueprint-compiler -, gtk4 -, libadwaita -, libnotify -, webkitgtk_6_0 -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook4 -, nix-update-script +{ + lib, + fetchFromGitea, + desktop-file-utils, + gettext, + glib, + gobject-introspection, + blueprint-compiler, + gtk4, + libadwaita, + libnotify, + webkitgtk_6_0, + meson, + ninja, + pkg-config, + python3, + wrapGAppsHook4, + librsvg, + gnome, + webp-pixbuf-loader, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.57.0"; + version = "1.58.0"; format = "other"; @@ -28,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-b2XoywPnrYnuehR6xHH8BvhbMZFB1AeBN0khFfaLGn0="; + hash = "sha256-21ZtzWjyUC+/iPv+R1DUzCHITR8GVhN+6iepcTIRy0Y="; }; nativeBuildInputs = [ @@ -74,6 +78,19 @@ python3.pkgs.buildPythonApplication rec { # Tests require network doCheck = false; + # Pull in WebP support for manga pics of some servers. + # In postInstall to run before gappsWrapperArgsHook. + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + librsvg + webp-pixbuf-loader + ]; + } + }" + ''; + # Prevent double wrapping. dontWrapGApps = true; @@ -87,12 +104,15 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Manga reader for GNOME"; mainProgram = "komikku"; homepage = "https://apps.gnome.org/Komikku/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}"; - maintainers = with maintainers; [ chuangzhu infinitivewitch ]; + maintainers = with lib.maintainers; [ + chuangzhu + infinitivewitch + ]; }; } diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index b980a418cbe0..3f2bb86fd965 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -7,23 +7,24 @@ , makeWrapper , copyDesktopItems , makeDesktopItem +, nix-update-script }: stdenv.mkDerivation rec { pname = "legcord"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; rev = "v${version}"; - hash = "sha256-R2mtE3L2cJgmbWT0aMoDbnM5tiyPk+dnPBedq8ro1lY="; + hash = "sha256-YmNRkNN7lWHMbUiGOxPa9b+TaLybj1XE7AonCnB88KY="; }; nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-73v8xkidY9IBUFz/M0BYEVGnoVsr3uh3jP0p6T8QBbA="; + hash = "sha256-ZPTp6l7qtvgsYPY6FZvhuYxD8TdkBkaQO2SG1fQzU7s="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -72,6 +73,8 @@ stdenv.mkDerivation rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Lightweight, alternative desktop client for Discord"; homepage = "https://legcord.app"; diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/by-name/li/libhv/package.nix similarity index 52% rename from pkgs/development/libraries/libhv/default.nix rename to pkgs/by-name/li/libhv/package.nix index 93524afabe49..4eb104dbce54 100644 --- a/pkgs/development/libraries/libhv/default.nix +++ b/pkgs/by-name/li/libhv/package.nix @@ -1,29 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + openssl, + darwin, +}: stdenv.mkDerivation (finalAttrs: { pname = "libhv"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "ithewei"; repo = "libhv"; rev = "v${finalAttrs.version}"; - hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk="; + hash = "sha256-N2YD84eORA5nDpeeqy9jCvRx86PkRaKLzI6LF1AnHtU="; }; - patches = [ - # Fix build failure on gcc-13: - # https://github.com/ithewei/libhv/pull/490 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/ithewei/libhv/commit/b3e61519fbdbbb956fed275c0a849ba5d4d6e45c.patch"; - hash = "sha256-fuYI+B3qZkSAbLZc0p6/0fnqaHx6w9N9vhTEE2t6UUs="; - }) - ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ + curl + openssl + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; cmakeFlags = [ "-DENABLE_UDS=ON" diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index 69c54cafcad9..68217973b082 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.12"; + version = "0.5.1"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-cq1FCsBHwcL8a51MswG/5TvyzSbtOvqw06OZfIXDVwg="; + hash = "sha256-k2mDqsxM6eveIFfdRu6ZxRsIgkA2qZxLfLNeWAEFCfs="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" ]; - cargoHash = "sha256-eXgZt8sLbHkVNWqFv8Zdq7xrFBi1YhKI8Js0OT2Npi8="; + cargoHash = "sha256-w34+3zRn4ZGA2aZZ3+lZqo4/QcDSpmt1HNb+gZtAavI="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix index c1d7c1540508..332c1d33ec25 100644 --- a/pkgs/by-name/ma/mangal/package.nix +++ b/pkgs/by-name/ma/mangal/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' # Mangal creates a config file in the folder ~/.config/mangal and fails if not possible export HOME=$(mktemp -d) installShellCompletion --cmd mangal \ diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 2a6ff5f5c53e..5b2e897ae7e3 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "mattkae"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; - hash = "sha256-fK/g6DhcxJMvxujZDZXs1yXRu2FGZQKmhxw7/czAQiY="; + hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0="; }; patches = [ diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix new file mode 100644 index 000000000000..d576d98ecea3 --- /dev/null +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -0,0 +1,84 @@ +{ + autoPatchelfHook, + fetchzip, + glib, + lib, + libxcb, + nspr, + nss, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "msedgedriver"; + # finding a version that has all 4 builds is a pain + # https://msedgewebdriverstorage.z22.web.core.windows.net/?form=MA13LH + version = "130.0.2849.1"; + + src = + let + inherit (stdenvNoCC.hostPlatform) system; + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + suffix = selectSystem { + x86_64-linux = "linux64"; + aarch64-linux = "arm64"; + x86_64-darwin = "mac64"; + aarch64-darwin = "mac64_m1"; + }; + + hash = selectSystem { + x86_64-linux = "sha256-U6YGD2PAhVUa7f+R5pmKLazGLOBbf3bRqzlwIJewA+w="; + aarch64-linux = "sha256-QJ1jRw8kkWbT8US5qI8DMZI/7Q8yJWpFXrfzGdxDWKE="; + x86_64-darwin = "sha256-Ejcv1DtuEiLJvTsv48AwoCQlFO3xM9PkM3HvZG65AC4="; + aarch64-darwin = "sha256-ykn4bYREE6xmJY02WiCRGsGnyWjnmnZM8FemK4XZqhc="; + }; + in + fetchzip { + url = "https://msedgedriver.azureedge.net/${finalAttrs.version}/edgedriver_${suffix}.zip"; + inherit hash; + stripRoot = false; + }; + + buildInputs = [ + glib + libxcb + nspr + nss + ]; + + nativeBuildInputs = lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [ autoPatchelfHook ]; + + installPhase = + if stdenvNoCC.hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/{Applications/msedgedriver,bin} + cp -R . $out/Applications/msedgedriver + + runHook postInstall + '' + else + '' + runHook preInstall + + install -m777 -D "msedgedriver" $out/bin/msedgedriver + + runHook postInstall + ''; + + meta = { + homepage = "https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver"; + description = "WebDriver implementation that controls an Edge browser running on the local machine"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ cholli ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + mainProgram = "msedgedriver"; + }; +}) diff --git a/pkgs/by-name/mt/mtdutils/package.nix b/pkgs/by-name/mt/mtdutils/package.nix index 15359970cfca..3347739d81c3 100644 --- a/pkgs/by-name/mt/mtdutils/package.nix +++ b/pkgs/by-name/mt/mtdutils/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR:=$(AR)" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; outputs = [ "out" diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 629b906d822e..9dbdb0848eef 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -1,45 +1,66 @@ { lib, buildGoModule, + stdenv, fetchFromGitHub, nezha-agent, + versionCheckHook, testers, }: buildGoModule rec { pname = "nezha-agent"; - version = "0.18.5"; + version = "0.20.2"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "refs/tags/v${version}"; - hash = "sha256-LmWfs3aL+1lsX4ix2FjDP5g+A0wgcfziXdw5SaKlAdk="; + hash = "sha256-BM3FhCf9zfccC2xC/Fhz2/andZmPYsJojMRUA3M9NOQ="; }; - vendorHash = "sha256-frPAhiexFSt+KobMbf32h8xv7HMcPl5koEgSs8Nz3cs="; + vendorHash = "sha256-q6/265vVg6jCnDvs825nni8QFHkJpQz4xxC9MlJH2do="; ldflags = [ "-s" "-w" "-X main.version=${version}" + "-X main.arch=${stdenv.hostPlatform.system}" ]; - # The test failed due to a geoip request in the sandbox. Remove it to avoid network requirement - preCheck = '' - rm ./pkg/monitor/myip_test.go + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestLookupIP" + "TestGeoIPApi" + "TestFetchGeoIP" + "TestCloudflareDetection" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + postInstall = '' + pushd $out/bin + mv agent nezha-agent + + # for compatibility + ln -sr nezha-agent agent + popd ''; - passthru.tests = { - version = testers.testVersion { - package = nezha-agent; - command = "${nezha-agent}/bin/agent -v"; - }; - }; + doInstallCheck = true; + + versionCheckProgramArg = "-v"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; meta = { description = "Agent of Nezha Monitoring"; homepage = "https://github.com/nezhahq/agent"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "nezha-agent"; }; } diff --git a/pkgs/by-name/oi/oil/package.nix b/pkgs/by-name/oi/oil/package.nix deleted file mode 100644 index 3cce7d592fee..000000000000 --- a/pkgs/by-name/oi/oil/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }: - -let - readline-all = symlinkJoin { - name = "readline-all"; paths = [ readline readline.dev ]; - }; -in -stdenv.mkDerivation rec { - pname = "oil"; - version = "0.22.0"; - - src = fetchurl { - url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-RS5/1Ci2hqp1LP65viuU+fz3upqyLgrlcKh83PeCJC4="; - }; - - postPatch = '' - patchShebangs build - ''; - - preInstall = '' - mkdir -p $out/bin - ''; - - strictDeps = true; - buildInputs = lib.optional withReadline readline; - # As of 0.20.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder), - # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to - # work just fine though, so we disable the error here. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; - configureFlags = [ - "--datarootdir=${placeholder "out"}" - ] ++ lib.optionals withReadline [ - "--with-readline" - "--readline=${readline-all}" - ]; - - # Stripping breaks the bundles by removing the zip file from the end. - dontStrip = true; - - meta = { - description = "New unix shell - Python version"; - homepage = "https://www.oilshell.org/"; - - license = with lib.licenses; [ - psfl # Includes a portion of the python interpreter and standard library - asl20 # Licence for Oil itself - ]; - - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ melkor333 ]; - changelog = "https://www.oilshell.org/release/${version}/changelog.html"; - }; - - passthru = { - shellPath = "/bin/osh"; - }; -} diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index 67dbc80e8afc..b33c93ac6d4f 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8="; + hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE="; }; postPatch = '' diff --git a/pkgs/by-name/op/opengv/package.nix b/pkgs/by-name/op/opengv/package.nix index 23b1b7e1d83d..3b6387306609 100644 --- a/pkgs/by-name/op/opengv/package.nix +++ b/pkgs/by-name/op/opengv/package.nix @@ -27,14 +27,16 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of computer vision methods for solving geometric vision problems"; homepage = "https://github.com/laurentkneip/opengv"; license = lib.licenses.bsd2; - longDescription = ''OpenGV is a collection of computer vision methods for solving + longDescription = '' + OpenGV is a collection of computer vision methods for solving geometric vision problems. It contains absolute-pose, relative-pose, triangulation, and point-cloud alignment methods for the calibrated case. All problems can be solved with central or non-central cameras, and embedded into a random sample consensus or nonlinear optimization context. Matlab and Python interfaces are implemented as well. The link to the above pages also shows links to precompiled Matlab mex-libraries. - Please consult the documentation for more information.''; + Please consult the documentation for more information. + ''; maintainers = [ lib.maintainers.locochoco ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix index f527bdd11aba..56172ace9892 100644 --- a/pkgs/by-name/op/openjump/package.nix +++ b/pkgs/by-name/op/openjump/package.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "openjump"; - version = "2.2.1"; - revision = "r5222%5B94156e5%5D"; + version = "2.3.0"; + revision = "r5279%5Bd24616e%5D"; src = fetchurl { url = "mirror://sourceforge/jump-pilot/OpenJUMP/${finalAttrs.version}/OpenJUMP-Portable-${finalAttrs.version}-${finalAttrs.revision}-PLUS.zip"; - hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI="; + hash = "sha256-IO44iGnFQt/ir1WlvBrEHjdC+0DZTfJIVAJgRcxrFMI="; }; # TODO: build from source diff --git a/pkgs/by-name/pi/pipeline/Cargo.lock b/pkgs/by-name/pi/pipeline/Cargo.lock new file mode 100644 index 000000000000..10492b6110b8 --- /dev/null +++ b/pkgs/by-name/pi/pipeline/Cargo.lock @@ -0,0 +1,2646 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "cairo-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" +dependencies = [ + "bitflags 2.6.0", + "cairo-sys-rs", + "glib", + "libc", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" +dependencies = [ + "glib-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-expr" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clapper" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "bitflags 2.6.0", + "clapper-sys", + "gio", + "glib", + "gstreamer", + "libc", +] + +[[package]] +name = "clapper-gtk" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "bitflags 2.6.0", + "clapper", + "clapper-gtk-sys", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", +] + +[[package]] +name = "clapper-gtk-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "clapper-sys", + "gio-sys", + "glib-sys", + "gtk4-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "clapper-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "gdk4" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 7.0.2", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", +] + +[[package]] +name = "gio-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", + "windows-sys 0.52.0", +] + +[[package]] +name = "glib" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c1ea829497810f8e87f5ee6d05c4879af641704add879e6b6080607cceeefe4" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", +] + +[[package]] +name = "glib-macros" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951aa19c5e89555c0ca5e94ee874b24b2594ece8412b387bd84ee3266b8a3ea0" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" +dependencies = [ + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "gobject-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "graphene-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps 7.0.2", +] + +[[package]] +name = "gsk4" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps 7.0.2", +] + +[[package]] +name = "gstreamer" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-sys" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "gtk4" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gtk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.2", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +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", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libadwaita" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" +dependencies = [ + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.2", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "pango" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piped-openapi-sdk" +version = "1.0.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/piped-rs#47e962fae9563e9a4b5a97756a448146b2b02413" +dependencies = [ + "reqwest", + "serde", + "serde_derive", + "serde_json", + "serde_with", + "url", + "uuid", +] + +[[package]] +name = "pipeline-api" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "futures", + "log", + "pipeline-core", +] + +[[package]] +name = "pipeline-core" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "url", +] + +[[package]] +name = "pipeline-provider-peertube" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "pipeline-core", + "reqwest", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "pipeline-provider-piped" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "log", + "piped-openapi-sdk", + "pipeline-core", + "reqwest", + "tokio", + "url", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.6.0", + "chrono", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", + "url", +] + +[[package]] +name = "rusqlite_migration" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55709bc01054c69e2f1cefdc886642b5e6376a8db3c86f761be0c423eebf178b" +dependencies = [ + "log", + "rusqlite", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.3", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr 0.15.8", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031" +dependencies = [ + "cfg-expr 0.16.0", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "temp-dir" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.5.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tubefeeder" +version = "2.0.2" +dependencies = [ + "chrono", + "clapper", + "clapper-gtk", + "csv", + "env_logger", + "futures", + "gdk4", + "gettext-rs", + "glib", + "gtk4", + "libadwaita", + "log", + "once_cell", + "pipeline-api", + "pipeline-core", + "pipeline-provider-peertube", + "pipeline-provider-piped", + "reqwest", + "rusqlite", + "rusqlite_migration", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[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.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[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.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +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 = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix new file mode 100644 index 000000000000..4aef16227c27 --- /dev/null +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + rustPlatform, + cargo, + rustc, + fetchFromGitLab, + gtk4, + libadwaita, + openssl, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + glib, + appstream-glib, + desktop-file-utils, + blueprint-compiler, + sqlite, + clapper, + gst_all_1, + gtuber, + glib-networking, + gnome, + webp-pixbuf-loader, + librsvg, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pipeline"; + version = "2.0.2"; + + src = fetchFromGitLab { + owner = "schmiddi-on-mobile"; + repo = "pipeline"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8LKd7zZuwo/HtxFo8x8UpO1Y8/DnTZmaOYrc9NmnIrc="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "clapper-0.1.0" = "sha256-IFFqfSq2OpzfopQXSYfnJ68HGLY+rvcLqk7NTdDd+28="; + "piped-openapi-sdk-1.0.0" = "sha256-UFzMYYqCzO6KyJvjvK/hBJtz3FOuSC2gWjKp72WFEGk="; + "pipeline-api-0.1.0" = "sha256-h094ZAJOqX9QC1EUAtzIVztudhndXglkYLcFbH/mpqQ="; + }; + }; + + nativeBuildInputs = [ + meson + ninja + cargo + rustPlatform.cargoSetupHook + rustc + pkg-config + wrapGAppsHook4 + glib + appstream-glib + desktop-file-utils + blueprint-compiler + ]; + + buildInputs = [ + gtk4 + libadwaita + openssl + sqlite + clapper + + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-plugins-bad + gtuber + glib-networking # For GIO_EXTRA_MODULES. Fixes "TLS support is not available" + ]; + + # Pull in WebP support for YouTube avatars. + # In postInstall to run before gappsWrapperArgsHook. + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + webp-pixbuf-loader + librsvg + ]; + } + }" + ''; + + passthru.updateScript = nix-update-script { attrPath = finalAttrs.pname; }; + + meta = { + description = "Watch YouTube and PeerTube videos in one place"; + homepage = "https://mobile.schmidhuberj.de/pipeline"; + mainProgram = "tubefeeder"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ chuangzhu ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix new file mode 100644 index 000000000000..0e37da28a939 --- /dev/null +++ b/pkgs/by-name/po/pocketsphinx/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + cmake, + doxygen, + fetchFromGitHub, + gitUpdater, + graphviz, + gst_all_1, + pkg-config, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pocketsphinx"; + version = "5.0.3"; + + src = fetchFromGitHub { + owner = "cmusphinx"; + repo = "pocketsphinx"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-aCQpRmGHX08rA8UIt6Xf37XM34HysEzvcucLhL355k8="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ]; + + buildInputs = [ gst_all_1.gstreamer ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "BUILD_GSTREAMER" true) + (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "${placeholder "data"}/share") + ]; + + outputs = [ + "out" + "data" + "dev" + "lib" + "man" + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "Small speech recognizer"; + homepage = "https://github.com/cmusphinx/pocketsphinx"; + changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${finalAttrs.version}/NEWS"; + license = with licenses; [ + bsd2 + bsd3 + mit + ]; + pkgConfigModules = [ "pocketsphinx" ]; + mainProgram = "pocketsphinx"; + maintainers = with maintainers; [ jopejoe1 ]; + }; +}) diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix new file mode 100644 index 000000000000..4b8d9c16c9ec --- /dev/null +++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, +}: + +buildGoModule rec { + pname = "prometheus-klipper-exporter"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "scross01"; + repo = "prometheus-klipper-exporter"; + rev = "v${version}"; + sha256 = "sha256-ow7bzgaY4pYccslITlkNBKfZBJv9uwPk25I1Y3bnjbU="; + }; + + vendorHash = "sha256-0nbLHZ2WMLMK0zKZuUYz355K01Xspn9svmlFCtQjed0="; + + doCheck = true; + + passthru.tests = { + inherit (nixosTests.prometheus-exporters) process; + }; + + meta = with lib; { + description = " Prometheus Exporter for Klipper "; + homepage = "https://github.com/scross01/prometheus-klipper-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ wulfsta ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ru/rustdesk/Cargo.lock b/pkgs/by-name/ru/rustdesk/Cargo.lock index 6ebeb4201503..406c1525a8f8 100644 --- a/pkgs/by-name/ru/rustdesk/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk/Cargo.lock @@ -17,12 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - [[package]] name = "aes" version = "0.8.4" @@ -54,7 +48,7 @@ dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy 0.7.34", ] [[package]] @@ -101,13 +95,12 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", "bitflags 2.6.0", - "cfg-if 1.0.0", "libc", ] @@ -175,9 +168,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", @@ -190,33 +183,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -231,17 +224,17 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" +source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" dependencies = [ "clipboard-win", "core-graphics 0.23.2", - "image 0.25.2", + "image 0.25.1", "log", "objc2 0.5.2", "objc2-app-kit", "objc2-foundation", "parking_lot", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "windows-sys 0.48.0", "wl-clipboard-rs", @@ -272,9 +265,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "flate2", "futures-core", @@ -285,13 +278,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -330,9 +323,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock 3.4.0", "cfg-if 1.0.0", @@ -340,11 +333,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.3", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -391,17 +384,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "async-signal" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.4", + "async-io 2.3.3", "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", @@ -410,7 +403,7 @@ dependencies = [ "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -421,13 +414,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -501,7 +494,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", ] @@ -546,7 +539,7 @@ dependencies = [ "log", "peeking_take_while", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", @@ -568,11 +561,11 @@ dependencies = [ "peeking_take_while", "prettyplease", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.76", + "syn 2.0.68", "which", ] @@ -589,11 +582,11 @@ dependencies = [ "lazy_static", "lazycell", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.76", + "syn 2.0.68", ] [[package]] @@ -614,7 +607,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -623,8 +616,8 @@ version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -730,9 +723,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -740,19 +733,13 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - [[package]] name = "bytes" -version = "1.7.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -821,13 +808,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.14" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" dependencies = [ "jobserver", "libc", - "shlex", + "once_cell", ] [[package]] @@ -890,7 +877,7 @@ dependencies = [ "js-sys", "num-traits 0.2.19", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -924,7 +911,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.5", + "libloading 0.8.4", ] [[package]] @@ -944,18 +931,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -965,9 +952,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clipboard" @@ -984,7 +971,7 @@ dependencies = [ "parking_lot", "percent-encoding", "rand 0.8.5", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "thiserror", "utf16string", @@ -1029,9 +1016,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] @@ -1044,7 +1031,7 @@ checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation 0.1.2", + "cocoa-foundation", "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types 0.3.2", @@ -1060,7 +1047,7 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation 0.1.2", + "cocoa-foundation", "core-foundation 0.9.4", "core-graphics 0.23.2", "foreign-types 0.5.0", @@ -1068,22 +1055,6 @@ dependencies = [ "objc", ] -[[package]] -name = "cocoa" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" -dependencies = [ - "bitflags 2.6.0", - "block", - "cocoa-foundation 0.2.0", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "foreign-types 0.5.0", - "libc", - "objc", -] - [[package]] name = "cocoa-foundation" version = "0.1.2" @@ -1098,20 +1069,6 @@ dependencies = [ "objc", ] -[[package]] -name = "cocoa-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "libc", - "objc", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -1120,9 +1077,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -1149,7 +1106,7 @@ version = "0.4.0-2" source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", - "serde 1.0.209", + "serde 1.0.203", "thiserror", "toml 0.5.11", ] @@ -1186,8 +1143,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "unicode-xid 0.2.5", + "quote 1.0.36", + "unicode-xid 0.2.4", ] [[package]] @@ -1207,7 +1164,7 @@ name = "core-foundation" version = "0.9.3" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -1217,33 +1174,15 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.7", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] [[package]] name = "core-foundation-sys" version = "0.8.6" -source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" -dependencies = [ - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -1284,19 +1223,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "foreign-types 0.5.0", - "libc", -] - [[package]] name = "core-graphics-types" version = "0.1.2" @@ -1319,17 +1245,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "libc", -] - [[package]] name = "coreaudio-rs" version = "0.11.3" @@ -1337,7 +1252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-sys", ] @@ -1357,7 +1272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-rs", "dasp_sample", "jni 0.21.1", @@ -1375,9 +1290,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1452,12 +1367,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.5" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.29.0", - "windows-sys 0.59.0", + "nix 0.28.0", + "windows-sys 0.52.0", ] [[package]] @@ -1660,7 +1575,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -1760,7 +1675,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading 0.8.4", ] [[package]] @@ -1794,7 +1709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -1823,7 +1738,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.209", + "serde 1.0.203", "strsim 0.10.0", ] @@ -1852,7 +1767,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "thiserror", ] @@ -1891,7 +1806,7 @@ dependencies = [ "objc", "pkg-config", "rdev", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "tfc", "unicode-segmentation", @@ -1923,8 +1838,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1934,7 +1849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -1944,8 +1859,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2064,7 +1979,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.4", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -2081,9 +1996,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -2106,14 +2021,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "libredox", - "windows-sys 0.59.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2124,12 +2039,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -2232,8 +2147,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2366,7 +2281,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -2380,8 +2295,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2655,7 +2570,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -2669,8 +2584,8 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2902,8 +2817,8 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2985,9 +2900,9 @@ dependencies = [ "regex", "rustls-pki-types", "rustls-platform-verifier", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", "socket2 0.3.19", "sodiumoxide", "sysinfo", @@ -3001,7 +2916,7 @@ dependencies = [ "url", "uuid", "winapi 0.3.9", - "zstd 0.13.2", + "zstd 0.13.1", ] [[package]] @@ -3128,21 +3043,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" +source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", ] [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -3196,7 +3111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -3242,12 +3157,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", - "byteorder-lite", + "byteorder", "num-traits 0.2.19", "png", "tiff", @@ -3277,14 +3192,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] name = "indexmap" -version = "2.4.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3347,11 +3262,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi 0.3.9", "libc", "windows-sys 0.52.0", ] @@ -3364,9 +3279,9 @@ checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -3436,9 +3351,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -3454,9 +3369,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3492,7 +3407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ "bitflags 2.6.0", - "serde 1.0.209", + "serde 1.0.203", "unicode-segmentation", ] @@ -3540,9 +3455,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -3577,12 +3492,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -3647,7 +3562,6 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", ] [[package]] @@ -3692,9 +3606,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -3702,6 +3616,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -3845,15 +3765,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - [[package]] name = "mio" version = "0.8.11" @@ -3866,25 +3777,13 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "muda" -version = "0.14.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ - "cocoa 0.26.0", + "cocoa 0.25.0", "crossbeam-channel", "dpi", "gtk", @@ -3894,7 +3793,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3956,7 +3855,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.3", + "num_enum 0.7.2", "thiserror", ] @@ -4143,7 +4042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -4154,8 +4053,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4217,11 +4116,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.3", + "num_enum_derive 0.7.2", ] [[package]] @@ -4232,20 +4131,20 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4423,9 +4322,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4461,9 +4360,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -4481,8 +4380,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4493,9 +4392,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4548,18 +4447,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.209", + "serde 1.0.203", "windows-sys 0.52.0", ] [[package]] name = "os_pipe" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" +checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4568,9 +4467,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", ] [[package]] @@ -4601,7 +4500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -4676,9 +4575,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -4786,8 +4685,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4804,12 +4703,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-io", ] @@ -4821,14 +4720,15 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "indexmap", - "quick-xml 0.32.0", - "serde 1.0.209", + "line-wrap", + "quick-xml 0.31.0", + "serde 1.0.203", "time 0.3.36", ] @@ -4842,7 +4742,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -4863,9 +4763,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -4873,7 +4773,7 @@ dependencies = [ "pin-project-lite", "rustix 0.38.34", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4884,12 +4784,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy 0.7.35", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -4899,12 +4796,12 @@ checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.76", + "syn 2.0.68", ] [[package]] @@ -4953,7 +4850,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", "version_check", ] @@ -4965,7 +4862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "version_check", ] @@ -4989,9 +4886,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" +checksum = "df67496db1a89596beaced1579212e9b7c53c22dca1d9745de00ead76573d514" dependencies = [ "bytes", "once_cell", @@ -5001,9 +4898,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" +checksum = "eab09155fad2d39333d3796f67845d43e29b266eea74f7bc93f153f707f126dc" dependencies = [ "anyhow", "once_cell", @@ -5016,9 +4913,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" +checksum = "1a16027030d4ec33e423385f73bb559821827e9ec18c50e7874e4d6de5a4e96f" dependencies = [ "anyhow", "indexmap", @@ -5032,9 +4929,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" +checksum = "70e2d30ab1878b2e72d1e2fc23ff5517799c9929e2cf81a8516f9f4dcf2b9cf3" dependencies = [ "thiserror", ] @@ -5089,9 +4986,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -5116,9 +5013,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2 1.0.86", ] @@ -5300,11 +5197,11 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" +source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", "dispatch", "enum-map", @@ -5313,7 +5210,7 @@ dependencies = [ "lazy_static", "libc", "log", - "mio 0.8.11", + "mio", "strum 0.24.1", "strum_macros 0.24.3", "widestring", @@ -5350,18 +5247,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -5370,9 +5267,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -5435,15 +5332,15 @@ dependencies = [ "rustls 0.21.12", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", - "serde 1.0.209", - "serde_json 1.0.127", + "serde 1.0.203", + "serde_json 1.0.118", "serde_urlencoded", "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", - "tokio-socks 0.5.2", + "tokio-socks 0.5.1", "tokio-util", "tower-service", "url", @@ -5575,7 +5472,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.0" +version = "1.3.1" dependencies = [ "android-wakelock", "android_logger", @@ -5587,7 +5484,7 @@ dependencies = [ "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.5.16", + "clap 4.5.8", "clipboard", "clipboard-master", "cocoa 0.24.1", @@ -5607,6 +5504,7 @@ dependencies = [ "flutter_rust_bridge", "fon", "fruitbasket", + "gtk", "hbb_common", "hex", "hound", @@ -5616,11 +5514,12 @@ dependencies = [ "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.5", + "libloading 0.8.4", "libpulse-binding", "libpulse-simple-binding", "mac_address", "magnum-opus", + "nix 0.29.0", "num_cpus", "objc", "objc_id", @@ -5641,9 +5540,9 @@ dependencies = [ "samplerate", "sciter-rs", "scrap", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", "serde_repr", "sha2", "shared_memory", @@ -5652,6 +5551,7 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "termios", "totp-rs", "tray-icon", "url", @@ -5672,7 +5572,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.0" +version = "1.3.1" dependencies = [ "brotli", "dirs 5.0.1", @@ -5738,15 +5638,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -5765,12 +5665,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.1.2", "rustls-pki-types", "schannel", "security-framework", @@ -5787,9 +5687,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -5797,25 +5697,25 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-platform-verifier" -version = "0.3.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" dependencies = [ "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "jni 0.19.0", "log", "once_cell", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.10", + "rustls-native-certs 0.7.0", "rustls-platform-verifier-android", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.4", "security-framework", "security-framework-sys", "webpki-roots 0.26.3", @@ -5824,9 +5724,9 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" @@ -5840,9 +5740,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -5935,8 +5835,8 @@ dependencies = [ "pkg-config", "quest", "repng", - "serde 1.0.209", - "serde_json 1.0.127", + "serde 1.0.203", + "serde_json 1.0.118", "target_build_utils", "tracing", "webm", @@ -5955,13 +5855,13 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "num-bigint", "security-framework-sys", @@ -5969,11 +5869,11 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -5991,22 +5891,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6023,14 +5923,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa 1.0.11", - "memchr", "ryu", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6040,17 +5939,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6062,7 +5961,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.11", "ryu", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6207,7 +6106,7 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6269,7 +6168,7 @@ checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -6281,7 +6180,7 @@ checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "rustversion", "syn 1.0.109", ] @@ -6310,18 +6209,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.76" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] @@ -6346,7 +6245,7 @@ version = "0.29.10" source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "ntapi", "once_cell", @@ -6371,7 +6270,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -6459,7 +6358,7 @@ version = "0.1.2" source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -6471,9 +6370,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "target_build_utils" @@ -6498,15 +6397,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.1", - "once_cell", + "fastrand 2.1.0", "rustix 0.38.34", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6539,7 +6437,7 @@ dependencies = [ [[package]] name = "tfc" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#87a6450f17659edba0cad669d9b57e8775479917" +source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#de9c8ba480f166a9fc90aaa47bb0e84b443ea9c6" dependencies = [ "anyhow", "core-graphics 0.23.2", @@ -6550,22 +6448,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6611,7 +6509,7 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde 1.0.209", + "serde 1.0.203", "time-core", "time-macros", ] @@ -6634,9 +6532,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -6649,31 +6547,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", + "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6702,11 +6601,23 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.2-1" @@ -6723,18 +6634,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-socks" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.11" @@ -6758,7 +6657,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6767,7 +6666,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.19.15", @@ -6779,7 +6678,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.20.2", @@ -6791,7 +6690,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6801,7 +6700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -6814,7 +6713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -6822,9 +6721,9 @@ dependencies = [ [[package]] name = "totp-rs" -version = "5.6.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b2f27dad992486c26b4e7455f38aa487e838d6d61b57e72906ee2b8c287a90" +checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f" dependencies = [ "base32", "constant_time_eq 0.2.6", @@ -6838,9 +6737,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" @@ -6860,8 +6759,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6885,10 +6784,10 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.15.1" -source = "git+https://github.com/tauri-apps/tray-icon#759f6a74fdcbcd979d3d39a2c9c2bc6a54e5e739" +version = "0.14.3" +source = "git+https://github.com/tauri-apps/tray-icon#d4078696edba67b0ab42cef67e6a421a0332c96f" dependencies = [ - "core-graphics 0.24.0", + "core-graphics 0.23.2", "crossbeam-channel", "dirs 5.0.1", "libappindicator", @@ -6899,7 +6798,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7029,9 +6928,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "untrusted" @@ -7048,7 +6947,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -7100,9 +6999,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", ] @@ -7133,9 +7032,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtual_display" @@ -7203,35 +7102,34 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", - "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7241,32 +7139,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.37", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" @@ -7327,7 +7225,7 @@ checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2 1.0.86", "quick-xml 0.34.0", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] @@ -7343,9 +7241,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -7456,11 +7354,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7541,7 +7439,7 @@ dependencies = [ "windows-core 0.52.0", "windows-implement", "windows-interface", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7551,7 +7449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7569,7 +7467,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7579,7 +7477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ "windows-result", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7589,8 +7487,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -7600,8 +7498,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -7610,7 +7508,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7648,16 +7546,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7692,18 +7581,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -7712,7 +7601,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7738,9 +7627,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -7768,9 +7657,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -7798,15 +7687,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -7834,9 +7723,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -7864,9 +7753,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -7882,9 +7771,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -7912,9 +7801,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -8077,12 +7966,12 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xdg-home" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8113,7 +8002,7 @@ dependencies = [ "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.209", + "serde 1.0.203", "serde_repr", "sha1", "static_assertions", @@ -8134,7 +8023,7 @@ checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "syn 1.0.109", "zvariant_utils", @@ -8146,7 +8035,7 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "static_assertions", "zvariant", ] @@ -8163,12 +8052,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ - "byteorder", - "zerocopy-derive 0.7.35", + "zerocopy-derive 0.7.34", ] [[package]] @@ -8178,19 +8066,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -8230,11 +8118,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 7.2.1", + "zstd-safe 7.1.0", ] [[package]] @@ -8249,18 +8137,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", @@ -8284,7 +8172,7 @@ dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.209", + "serde 1.0.203", "static_assertions", "zvariant_derive", ] @@ -8297,7 +8185,7 @@ checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", "zvariant_utils", ] @@ -8309,6 +8197,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index b038c6c38333..a1f5b2491020 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -37,26 +37,26 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; + hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; + "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; + "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; @@ -64,15 +64,15 @@ rustPlatform.buildRustPackage rec { "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; - "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; + "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; - "tfc-0.7.0" = "sha256-VAoOadgGajWjW7q1RCwmQ5gMmaA1oeZBSiL1tYSuIEI="; + "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; - "tray-icon-0.15.1" = "sha256-DvTVAsE3dB+o89SFk3RPRt5JzaWjPl4nlvC77zsVN/s="; + "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' # Overwrite cargo.lock because the one in the upstream repo has duplicates entries. # It should probably be removed in the next rustdesk update (if they fix their cargoLock) - ln -fs ${./Cargo.lock} Cargo.lock + cp ${./Cargo.lock} Cargo.lock ''; desktopItems = [ @@ -189,5 +189,6 @@ rustPlatform.buildRustPackage rec { leixb ]; mainProgram = "rustdesk"; + badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix new file mode 100644 index 000000000000..e8b2c0ba9b50 --- /dev/null +++ b/pkgs/by-name/sc/scite/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "scite"; + version = "5.5.3"; + + src = fetchurl { + url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; + hash = "sha256-MtXy8a4MzdJP8Rf6otc+Zu+KfYSJnmmXfBS8RVBBbOY="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + sourceRoot = "scite/gtk"; + + makeFlags = [ + "GTK3=1" + "prefix=${placeholder "out"}" + ]; + + CXXFLAGS = [ + # GCC 13: error: 'intptr_t' does not name a type + "-include cstdint" + "-include system_error" + ]; + + preBuild = '' + pushd ../../scintilla/gtk + make ''${makeFlags[@]} + popd + + pushd ../../lexilla/src + make ''${makeFlags[@]} + popd + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "https://www.scintilla.org/SciTE.html"; + description = "SCIntilla based Text Editor"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + rszibele + aleksana + ]; + mainProgram = "SciTE"; + }; +}) diff --git a/pkgs/by-name/sc/screentest/package.nix b/pkgs/by-name/sc/screentest/package.nix index 6d671f608903..df4922afb922 100644 --- a/pkgs/by-name/sc/screentest/package.nix +++ b/pkgs/by-name/sc/screentest/package.nix @@ -1,43 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, intltool -, pkg-config -, gtk2 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { pname = "screentest"; - version = "unstable-2021-05-10"; + version = "3.0"; src = fetchFromGitHub { owner = "TobiX"; repo = "screentest"; - rev = "780e6cbbbbd6ba93e246e7747fe593b40c4e2747"; - hash = "sha256-TJ47c77vQ/aRBJ2uEiFLuAR4dd4CMEo+iAAx0HCFbmA="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-dbag1EAD+6+srfu/eqSl3CWlZtSopioQjyBQRJcUggA="; }; strictDeps = true; nativeBuildInputs = [ - autoreconfHook - intltool + meson + ninja pkg-config - gtk2 # for autoconf macros + wrapGAppsHook3 ]; - buildInputs = [ - gtk2 - ]; - - meta = with lib; { + meta = { description = "Simple screen testing tool"; mainProgram = "screentest"; homepage = "https://github.com/TobiX/screentest"; - changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.src.rev}/NEWS"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ evils ]; - platforms = platforms.unix; + changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/NEWS"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ evils ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index f277c2a007c3..376de9713c14 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-YnabQ8YHDsFYu5RX3E2NvPARsl+qn4688q9KxZ5Fegc="; + hash = "sha256-gPuzwJtQdQDFVuWYoH/TGSf+Fp++UvK9D7mL41p9eOk="; }; - cargoHash = "sha256-yD40QKceLjtq80K6I98bT27sCAkCnkRkfE3m4eGjueU="; + cargoHash = "sha256-ML+USTwdMLyLcc3Fzu/eD7J7s7Sa1lEOZm/txjZv31E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch b/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch deleted file mode 100644 index ca48d140081d..000000000000 --- a/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c0152b6bbd751313be756fdcd7b3e3912567b535 Mon Sep 17 00:00:00 2001 -From: Will Owens -Date: Fri, 1 Mar 2024 01:37:55 -0500 -Subject: [PATCH] nix-build: use nix native llama-cpp package - ---- - crates/llama-cpp-bindings/build.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/crates/llama-cpp-bindings/build.rs b/crates/llama-cpp-bindings/build.rs -index 06629ac4..aa004493 100644 ---- a/crates/llama-cpp-bindings/build.rs -+++ b/crates/llama-cpp-bindings/build.rs -@@ -12,10 +12,10 @@ fn main() { - - println!("cargo:rerun-if-changed=include/engine.h"); - println!("cargo:rerun-if-changed=src/engine.cc"); -+ println!("cargo:rustc-link-search=native={}", env::var("LLAMA_CPP_LIB").unwrap()); - println!("cargo:rustc-link-lib=llama"); -- println!("cargo:rustc-link-lib=ggml_static"); -+ println!("cargo:rustc-link-lib=ggml_shared"); - -- build_llama_cpp(); - build_cxx_binding(); - } - --- -2.43.1 - diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index a00e9b862f01..e310f97d2622 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -32,16 +32,16 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "aim-downloader" -version = "0.11.1" +version = "0.18.0" dependencies = [ "async-stream", "clap", @@ -52,7 +52,7 @@ dependencies = [ "indicatif", "netrc", "regex", - "reqwest 0.12.4", + "reqwest", "serial_test 2.0.0", "sha2", "strfmt", @@ -63,9 +63,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -82,160 +82,72 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "apalis" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "apalis-cron", - "apalis-redis", - "apalis-sql", - "futures", - "pin-project-lite", - "serde", - "thiserror", - "tokio", - "tower", - "tracing", - "tracing-futures", -] - -[[package]] -name = "apalis-core" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "async-oneshot", - "futures", - "pin-project-lite", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower", - "ulid", -] - -[[package]] -name = "apalis-cron" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "async-stream", - "chrono", - "cron", - "futures", - "tower", -] - -[[package]] -name = "apalis-redis" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "async-stream", - "async-trait", - "chrono", - "futures", - "log", - "redis", - "serde", - "tokio", -] - -[[package]] -name = "apalis-sql" -version = "0.5.1" -source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" -dependencies = [ - "apalis-core", - "async-stream", - "futures", - "futures-lite", - "log", - "serde", - "serde_json", - "sqlx", - "tokio", -] +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", @@ -274,15 +186,6 @@ dependencies = [ "async-trait", ] -[[package]] -name = "async-oneshot" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae47de2a02d543205f3f5457a90b6ecbc9494db70557bd29590ec8f1ddff5463" -dependencies = [ - "futures-micro", -] - [[package]] name = "async-openai" version = "0.20.0" @@ -291,12 +194,12 @@ checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" dependencies = [ "async-convert", "backoff", - "base64 0.22.0", + "base64 0.22.1", "bytes", - "derive_builder 0.20.0", + "derive_builder", "futures", - "rand", - "reqwest 0.12.4", + "rand 0.8.5", + "reqwest", "reqwest-eventsource", "secrecy", "serde", @@ -327,7 +230,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -338,7 +241,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -350,6 +253,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "auto_enums" version = "0.8.5" @@ -359,14 +268,14 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -376,7 +285,7 @@ checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.5", + "base64 0.21.7", "bytes", "futures-util", "http 1.1.0", @@ -384,7 +293,7 @@ dependencies = [ "http-body-util", "hyper 1.3.1", "hyper-util", - "itoa", + "itoa 1.0.11", "matchit", "memchr", "mime", @@ -478,45 +387,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom", + "getrandom 0.2.15", "instant", "pin-project-lite", - "rand", + "rand 0.8.5", "tokio", ] [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -541,18 +444,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] [[package]] name = "bitpacking" -version = "0.8.4" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" dependencies = [ "crunchy", ] @@ -577,31 +480,38 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", + "regex-automata 0.4.6", "serde", ] [[package]] -name = "bumpalo" -version = "3.13.0" +name = "build-target" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cached" @@ -614,7 +524,7 @@ dependencies = [ "cached_proc_macro", "cached_proc_macro_types", "futures", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "instant", "once_cell", "thiserror", @@ -639,34 +549,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" -[[package]] -name = "cargo-lock" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" -dependencies = [ - "petgraph", - "semver", - "serde", - "toml 0.7.4", - "url", -] - [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] name = "census" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fafee10a5dd1cffcb5cc560e0d0df8803d7355a2b12272e3557dee57314cb6e" +checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" [[package]] name = "cfg-if" @@ -676,9 +574,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -686,7 +584,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-targets 0.52.5", ] [[package]] @@ -695,15 +593,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", "stacker", ] [[package]] name = "clap" -version = "4.4.11" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -711,33 +609,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" @@ -749,20 +647,37 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "color-eyre" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" dependencies = [ - "termcolor", - "unicode-width", + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", ] [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -777,31 +692,17 @@ dependencies = [ "unreachable", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util", -] - [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -811,10 +712,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] -name = "core-foundation" -version = "0.9.3" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[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", @@ -822,24 +729,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -852,9 +759,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -872,36 +779,30 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] @@ -915,9 +816,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -935,66 +836,39 @@ dependencies = [ "typenum", ] +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.66", +] + [[package]] name = "custom_error" version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" -[[package]] -name = "cxx" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109308c20e8445959c2792e81871054c6a17e6976489a93d2769641a2ba5839c" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf4c6755cdf10798b97510e0e2b3edb9573032bd9379de8fffa59d68165494f" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.52", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882074421238e84fe3b4c65d0081de34e5b323bf64555d3e61991f76eb64a7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a076022ece33e7686fb76513518e219cca4fce5750a8ae6d1ce6c0f48fd1af9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.14.4" @@ -1007,26 +881,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1045,27 +905,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.52", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", + "strsim 0.11.1", + "syn 2.0.66", ] [[package]] @@ -1081,13 +930,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1097,23 +946,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core", ] [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1130,55 +979,13 @@ dependencies = [ "serde", ] -[[package]] -name = "derive_builder" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -dependencies = [ - "derive_builder_macro 0.11.2", -] - -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro 0.12.0", -] - [[package]] name = "derive_builder" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "derive_builder_macro 0.20.0", -] - -[[package]] -name = "derive_builder_core" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", + "derive_builder_macro", ] [[package]] @@ -1187,30 +994,10 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.20.8", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.52", -] - -[[package]] -name = "derive_builder_macro" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core 0.11.2", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core 0.12.0", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1219,8 +1006,21 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ - "derive_builder_core 0.20.0", - "syn 2.0.52", + "derive_builder_core", + "syn 2.0.66", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", ] [[package]] @@ -1231,7 +1031,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1254,26 +1054,41 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" dependencies = [ "serde", ] [[package]] name = "email-encoding" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" +checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" dependencies = [ - "base64 0.21.5", + "base64 0.22.1", "memchr", ] @@ -1290,14 +1105,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "encoding_rs" -version = "0.8.32" +name = "encoder" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "03f6928ad5c6efcdae42eb068dff8a555ef2f057c92bbd491ddf5610f6444987" +dependencies = [ + "encoder-ryu", + "indexmap 2.2.6", + "serde_json", + "simd-json", +] + +[[package]] +name = "encoder-ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e27addc39f5f73c85604bfe21b59fe93717f9765194015d92bde1db11e8ccef" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] +[[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1306,23 +1148,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1354,25 +1185,26 @@ dependencies = [ ] [[package]] -name = "fastdivide" -version = "0.4.0" +name = "eyre" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ - "instant", + "indenter", + "once_cell", ] [[package]] -name = "fastrand" -version = "2.0.1" +name = "fastdivide" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fid-rs" @@ -1384,35 +1216,22 @@ dependencies = [ ] [[package]] -name = "file-rotate" -version = "0.7.5" +name = "flate2" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf221ceec4517f3cb764dae3541b2bd87666fc8832e51322fbb97250b468c71" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ - "chrono", - "flate2", + "crc32fast", + "miniz_oxide", ] [[package]] -name = "finl_unicode" -version = "1.2.0" +name = "float-cmp" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", + "num-traits", ] [[package]] @@ -1456,24 +1275,14 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "fs4" -version = "0.6.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" dependencies = [ - "rustix 0.38.17", - "windows-sys 0.48.0", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -1483,10 +1292,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] -name = "futures" -version = "0.3.28" +name = "futf" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1499,9 +1318,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1509,15 +1328,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1532,71 +1351,49 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.12.1", + "parking_lot", ] [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.0.1", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", -] - -[[package]] -name = "futures-micro" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b460264b3593d68b16a7bc35f7bc226ddfebdf9a1c8db1ed95d5cc6b7168c826" -dependencies = [ - "pin-project-lite", + "syn 2.0.66", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1621,15 +1418,15 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ "cc", "libc", "log", "rustversion", - "windows", + "windows 0.48.0", ] [[package]] @@ -1644,22 +1441,33 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" @@ -1667,7 +1475,7 @@ version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -1678,23 +1486,23 @@ dependencies = [ [[package]] name = "gitlab" -version = "0.1610.0" +version = "0.1700.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c802fc7eb82ff5ba2e4447c5acd0f18ec1b7bb95dbe95b6d77639e25be7cbe" +checksum = "65f36adc608cffeec1cc08ecf1977c038cbb1af9184b2174ca006ebeb817991c" dependencies = [ "async-trait", - "base64 0.13.1", + "base64 0.22.1", "bytes", "chrono", "cron", - "derive_builder 0.11.2", + "derive_builder", "futures-util", "graphql_client", - "http 0.2.11", - "itertools 0.10.5", + "http 1.1.0", + "itertools 0.12.1", "log", "percent-encoding", - "reqwest 0.11.22", + "reqwest", "serde", "serde_json", "serde_urlencoded", @@ -1702,12 +1510,6 @@ dependencies = [ "url", ] -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - [[package]] name = "globset" version = "0.4.14" @@ -1718,17 +1520,7 @@ dependencies = [ "bstr", "log", "regex-automata 0.4.6", - "regex-syntax 0.8.2", -] - -[[package]] -name = "globwalk" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9db17aec586697a93219b19726b5b68307eba92898c34b170857343fe67c99d" -dependencies = [ - "ignore", - "walkdir", + "regex-syntax 0.8.3", ] [[package]] @@ -1746,15 +1538,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" dependencies = [ - "combine 3.8.1", + "combine", "thiserror", ] [[package]] name = "graphql_client" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc" +checksum = "a50cfdc7f34b7f01909d55c2dcb71d4c13cbcbb4a1605d6c8bd760d654c1144b" dependencies = [ "graphql_query_derive", "serde", @@ -1763,13 +1555,13 @@ dependencies = [ [[package]] name = "graphql_client_codegen" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f290ecfa3bea3e8a157899dc8a1d96ee7dd6405c18c8ddd213fc58939d18a0e9" +checksum = "5e27ed0c2cf0c0cc52c6bcf3b45c907f433015e580879d14005386251842fb0a" dependencies = [ "graphql-introspection-query", "graphql-parser", - "heck", + "heck 0.4.1", "lazy_static", "proc-macro2", "quote", @@ -1780,9 +1572,9 @@ dependencies = [ [[package]] name = "graphql_query_derive" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce" +checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" dependencies = [ "graphql_client_codegen", "proc-macro2", @@ -1790,35 +1582,95 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.3.19" +name = "grep" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "6e2b024ec1e686cb64d78beb852030b0e632af93817f1ed25be0173af0e94939" dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.11", - "indexmap 1.9.3", - "slab", - "tokio", - "tokio-util", - "tracing", + "grep-cli", + "grep-matcher", + "grep-printer", + "grep-regex", + "grep-searcher", +] + +[[package]] +name = "grep-cli" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea40788c059ab8b622c4d074732750bfb3bd2912e2dd58eabc11798a4d5ad725" +dependencies = [ + "bstr", + "globset", + "libc", + "log", + "termcolor", + "winapi-util", +] + +[[package]] +name = "grep-matcher" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" +dependencies = [ + "memchr", +] + +[[package]] +name = "grep-printer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743c12a03c8aee38b6e5bd0168d8ebb09345751323df4a01c56e792b1f38ceb2" +dependencies = [ + "bstr", + "grep-matcher", + "grep-searcher", + "log", + "serde", + "serde_json", + "termcolor", +] + +[[package]] +name = "grep-regex" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" +dependencies = [ + "bstr", + "grep-matcher", + "log", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "grep-searcher" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" +dependencies = [ + "bstr", + "encoding_rs", + "encoding_rs_io", + "grep-matcher", + "log", + "memchr", + "memmap2", ] [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http 1.1.0", "indexmap 2.2.6", "slab", @@ -1828,10 +1680,18 @@ dependencies = [ ] [[package]] -name = "hash-ids" -version = "0.2.1" +name = "halfbrown" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9289cbc8064a1c2f505c92d4d17f7fe5050d487728c19cee7936bd204069bc9d" +checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" +dependencies = [ + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "hash-ids" +version = "0.18.0" [[package]] name = "hashbrown" @@ -1841,9 +1701,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1855,7 +1715,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1864,7 +1724,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "headers-core", "http 1.1.0", @@ -1892,19 +1752,16 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1932,22 +1789,60 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows 0.52.0", +] + +[[package]] +name = "htmd" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fff09744b11deed5946dd1b61c806bb9a94ded93cf28da819935599b69b987" +dependencies = [ + "html5ever 0.27.0", + "markup5ever_rcdom", +] + +[[package]] +name = "html5ever" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever 0.10.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +dependencies = [ + "log", + "mac", + "markup5ever 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -1958,13 +1853,13 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.11", ] [[package]] @@ -1975,35 +1870,36 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.11", ] [[package]] name = "http-api-bindings" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "async-openai", "async-stream", "async-trait", "futures", - "reqwest 0.12.4", + "ollama-api-bindings", + "reqwest", "reqwest-eventsource", "serde", "serde_json", "tabby-common", "tabby-inference", - "tracing", + "tokio", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -2030,12 +1926,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe" - [[package]] name = "httparse" version = "1.8.0" @@ -2044,9 +1934,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -2056,22 +1946,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.19", - "http 0.2.11", - "http-body 0.4.5", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", - "itoa", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2087,32 +1976,18 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.4", + "h2", "http 1.1.0", "http-body 1.0.0", "httparse", "httpdate", - "itoa", + "itoa 1.0.11", "pin-project-lite", "smallvec", "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.27", - "rustls 0.21.10", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.26.0" @@ -2124,11 +1999,11 @@ dependencies = [ "hyper 1.3.1", "hyper-util", "log", - "rustls 0.22.4", + "rustls", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls", "tower-service", ] @@ -2163,9 +2038,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -2174,7 +2049,7 @@ dependencies = [ "http-body 1.0.0", "hyper 1.3.1", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio", "tower", "tower-service", @@ -2183,16 +2058,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2210,16 +2085,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[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" @@ -2230,12 +2095,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "ignore" version = "0.4.22" @@ -2252,6 +2111,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" version = "1.9.3" @@ -2269,15 +2134,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2288,9 +2153,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -2299,14 +2164,13 @@ dependencies = [ "pest_derive", "serde", "similar", - "yaml-rust", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -2314,22 +2178,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.7.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iri-string" @@ -2342,22 +2195,10 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.10.5" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -2369,36 +2210,52 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "9.1.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", + "js-sys", "pem", "ring", "serde", @@ -2434,6 +2291,7 @@ checksum = "1f81e883bc6ffb2e5a3cc7276bfe9519c49108bdc1330d5aab1b79cb088f2f26" dependencies = [ "axum", "bytes", + "futures", "juniper", "juniper_graphql_ws", "serde", @@ -2448,7 +2306,7 @@ checksum = "760dbe46660494d469023d661e8d268f413b2cb68c999975dcc237407096a693" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "url", ] @@ -2475,27 +2333,15 @@ dependencies = [ ] [[package]] -name = "kdam" -version = "0.5.0" +name = "kuchiki" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e352f4e1acc6a3d0919eaeb014ca63e5da9450a12ef7106fe2936a07a1648d44" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ - "terminal_size", - "windows-sys 0.48.0", -] - -[[package]] -name = "kv" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620727085ac39ee9650b373fe6d8073a0aee6f99e52a9c72b25f7671078039ab" -dependencies = [ - "pin-project-lite", - "serde", - "serde_json", - "sled", - "thiserror", - "toml 0.5.11", + "cssparser", + "html5ever 0.25.2", + "matches", + "selectors", ] [[package]] @@ -2509,26 +2355,27 @@ dependencies = [ [[package]] name = "lettre" -version = "0.11.3" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5aaf628956b6b0852e12ac3505d20d7a12ecc1e32d5ea921f002af4a74036a5" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" dependencies = [ "async-trait", - "base64 0.21.5", + "base64 0.22.1", "chumsky", "email-encoding", "email_address", - "fastrand 2.0.1", + "fastrand", "futures-io", "futures-util", "hostname", "httpdate", - "idna 0.5.0", + "idna", "mime", "native-tls", "nom", + "percent-encoding", "quoted_printable", - "socket2 0.5.5", + "socket2", "tokio", "tokio-native-tls", "url", @@ -2541,10 +2388,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" [[package]] -name = "libc" -version = "0.2.149" +name = "lexical-core" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -2603,9 +2514,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -2613,15 +2524,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2630,37 +2532,36 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[package]] -name = "llama-cpp-bindings" -version = "0.11.1" +name = "llama-cpp-server" +version = "0.18.0" dependencies = [ - "async-stream", + "anyhow", + "async-openai", "async-trait", "cmake", - "cxx", - "cxx-build", - "derive_builder 0.12.0", "futures", + "http-api-bindings", + "omnicopy_to_output", + "reqwest", + "serde", + "serdeconv", + "tabby-common", "tabby-inference", "tokio", "tracing", + "which", ] [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2668,9 +2569,20 @@ 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 = "logkit" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b517d00135d2ea552dc1f6cbc5da9d8953f895c91db680c288d53c50ca309767" +dependencies = [ + "backtrace", + "chrono", + "encoder", +] [[package]] name = "loom" @@ -2683,7 +2595,7 @@ dependencies = [ "pin-utils", "scoped-tls", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber", ] [[package]] @@ -2697,32 +2609,69 @@ dependencies = [ [[package]] name = "lru" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" [[package]] -name = "match_cfg" -version = "0.1.0" +name = "mac" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] -name = "matchers" -version = "0.0.1" +name = "maplit" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ - "regex-automata 0.1.10", + "log", + "phf 0.8.0", + "phf_codegen 0.8.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +dependencies = [ + "log", + "phf 0.11.2", + "phf_codegen 0.11.2", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever_rcdom" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" +dependencies = [ + "html5ever 0.27.0", + "markup5ever 0.12.1", + "tendril", + "xml5ever", ] [[package]] @@ -2735,10 +2684,16 @@ dependencies = [ ] [[package]] -name = "matchit" -version = "0.7.0" +name = "matches" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "md-5" @@ -2752,9 +2707,9 @@ dependencies = [ [[package]] name = "measure_time" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56220900f1a0923789ecd6bf25fbae8af3b2f1ff3e9e297fc9b6b8674dd4d852" +checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" dependencies = [ "instant", "log", @@ -2768,28 +2723,13 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] -[[package]] -name = "memo-map" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "metrics" version = "0.22.3" @@ -2806,8 +2746,8 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ - "base64 0.21.5", - "hyper 0.14.27", + "base64 0.21.7", + "hyper 0.14.28", "indexmap 2.2.6", "ipnet", "metrics", @@ -2825,7 +2765,7 @@ checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "metrics", "num_cpus", "quanta", @@ -2848,17 +2788,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minijinja" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80084fa3099f58b7afab51e5f92e24c2c2c68dcad26e96ad104bd6011570461d" -dependencies = [ - "memo-map", - "self_cell", - "serde", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2867,46 +2796,36 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] [[package]] name = "murmurhash32" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9380db4c04d219ac5c51d14996bbf2c2e9a15229771b53f8671eb6c83cf44df" +checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2924,6 +2843,18 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + [[package]] name = "nom" version = "7.1.3" @@ -2934,17 +2865,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "npm-package-json" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df163f89771bd6654d5e116952b9ab2d0b952cd8e3315ddaa615f6d2bfbb1fde" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -2971,7 +2891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" dependencies = [ "nucleo-matcher", - "parking_lot 0.12.1", + "parking_lot", "rayon", ] @@ -2987,11 +2907,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3008,7 +2927,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -3019,32 +2938,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -3053,9 +2960,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3063,19 +2970,19 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -3111,9 +3018,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3126,7 +3033,7 @@ checksum = "68a8a3df00728324ad654ecd1ed449a60157c55b7ff8c109af3a35989687c367" dependencies = [ "arc-swap", "async-trait", - "base64 0.22.0", + "base64 0.22.1", "bytes", "cfg-if", "chrono", @@ -3137,7 +3044,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.3.1", - "hyper-rustls 0.26.0", + "hyper-rustls", "hyper-timeout", "hyper-util", "jsonwebtoken", @@ -3157,6 +3064,45 @@ dependencies = [ "url", ] +[[package]] +name = "ollama-api-bindings" +version = "0.18.0" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "futures", + "ollama-rs", + "tabby-common", + "tabby-inference", + "tracing", +] + +[[package]] +name = "ollama-rs" +version = "0.1.9" +source = "git+https://github.com/pepperoni21/ollama-rs.git?rev=56e8157d98d4185bc171fe9468d3d09bc56e9dd3#56e8157d98d4185bc171fe9468d3d09bc56e9dd3" +dependencies = [ + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "url", +] + +[[package]] +name = "omnicopy_to_output" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10aff4d07c3656c416a997301d51ed83be62cbb256b421f86b014931217f2393" +dependencies = [ + "anyhow", + "build-target", + "fs_extra", + "project-root", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -3165,20 +3111,19 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oneshot" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc22d22931513428ea6cc089e942d38600e3d00976eef8c86de6b8a3aadec6eb" +version = "0.1.6" +source = "git+https://github.com/fulmicoton/oneshot.git?rev=b208f49#b208f493e505f5f37e180b5cdec4c22b6f99abaa" dependencies = [ "loom", ] [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -3195,7 +3140,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -3206,18 +3151,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.3.0+3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -3265,7 +3210,7 @@ dependencies = [ "once_cell", "opentelemetry_api", "percent-encoding", - "rand", + "rand 0.8.5", "thiserror", ] @@ -3277,77 +3222,39 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8a72b918ae8198abb3a18c190288123e1d442b6b9a7d709305fd194688b4b7" +version = "0.7.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "stable_deref_trait", ] [[package]] -name = "package-lock-json-parser" -version = "0.4.0" +name = "owo-colors" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8707d34f4a67f9c733970b8afc7b82d8623bc0746ff17b460aa6f2ea5ef487d3" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.52.5", ] [[package]] @@ -3367,23 +3274,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pem" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.5", + "base64 0.22.1", "serde", ] @@ -3404,9 +3311,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -3415,9 +3322,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -3425,22 +3332,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -3448,40 +3355,141 @@ dependencies = [ ] [[package]] -name = "petgraph" -version = "0.6.3" +name = "phf" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "fixedbitset", - "indexmap 1.9.3", + "phf_macros", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", ] [[package]] name = "pin-project" -version = "1.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.52", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3512,15 +3520,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.3.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "powerfmt" @@ -3534,6 +3542,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3559,14 +3573,26 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "proc-macro-hack" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] +[[package]] +name = "project-root" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" + [[package]] name = "psm" version = "0.1.21" @@ -3586,7 +3612,7 @@ dependencies = [ "libc", "once_cell", "raw-cpuid", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi", ] @@ -3599,9 +3625,9 @@ checksum = "9318ead08c799aad12a55a3e78b82e0b6167271ffd1f627b758891282f739187" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3612,6 +3638,20 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + [[package]] name = "rand" version = "0.8.5" @@ -3619,8 +3659,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -3630,7 +3680,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", ] [[package]] @@ -3639,7 +3698,35 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -3648,14 +3735,14 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3663,55 +3750,64 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] -name = "redis" -version = "0.25.3" +name = "readable-readability" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd" +checksum = "c17015928a25bff296b0471dfa7a784e406664e1d091781db66e885b18708a8d" dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "combine 4.6.7", - "futures", - "futures-util", - "itoa", - "percent-encoding", - "pin-project-lite", - "ryu", - "sha1_smol", - "tokio", - "tokio-retry", - "tokio-util", + "html5ever 0.25.2", + "kuchiki", + "lazy_static", + "log", + "regex", "url", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", +] + +[[package]] +name = "ref-cast" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -3723,7 +3819,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3743,7 +3839,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3754,62 +3850,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "requirements" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2643e903f79d8e6bc310ee0def974d12a33561d14e0728511b6ba5e8be0791c3" -dependencies = [ - "globwalk", - "pest", - "pest_derive", - "regex", - "walkdir", -] - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "base64 0.21.5", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.19", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.27", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.10", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg 0.50.0", -] +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" @@ -3817,17 +3860,18 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2 0.4.4", + "h2", "http 1.1.0", "http-body 1.0.0", "http-body-util", "hyper 1.3.1", - "hyper-rustls 0.26.0", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -3839,9 +3883,9 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.22.4", + "rustls", "rustls-native-certs", - "rustls-pemfile 2.1.2", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -3850,7 +3894,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.25.0", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -3858,7 +3902,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.52.0", + "webpki-roots", + "winreg", ] [[package]] @@ -3873,29 +3918,30 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest 0.12.4", + "reqwest", "thiserror", ] [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom", + "cfg-if", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rmp" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -3904,9 +3950,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -3926,7 +3972,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.6.4", "signature", "spki", "subtle", @@ -3935,9 +3981,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.0.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -3946,22 +3992,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.0.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.52", + "syn 2.0.66", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.0.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "sha2", "walkdir", @@ -3979,9 +4025,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3990,42 +4036,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustix" -version = "0.37.19" +name = "rustc_version" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", + "semver", ] [[package]] name = "rustix" -version = "0.38.17" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] @@ -4037,7 +4066,7 @@ dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.3", + "rustls-webpki", "subtle", "zeroize", ] @@ -4049,52 +4078,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.2", + "rustls-pemfile", "rustls-pki-types", "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 0.21.5", -] - [[package]] name = "rustls-pemfile" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -4103,15 +4113,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -4123,12 +4133,21 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.21" +name = "scc" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" dependencies = [ - "windows-sys 0.42.0", + "sdd", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", ] [[package]] @@ -4139,25 +4158,15 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scratch" -version = "1.0.5" +name = "sdd" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] +checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" [[package]] name = "secrecy" @@ -4171,11 +4180,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -4184,48 +4193,49 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", ] [[package]] -name = "self_cell" -version = "1.0.1" +name = "selectors" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-jsonlines" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4684abdec99c1de7e507a3516c82385ff74d54c385973846b079bfd9f5920d35" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "serde-jsonlines" version = "0.5.0" @@ -4238,40 +4248,41 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ - "itoa", + "itoa 1.0.11", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.11" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ + "itoa 1.0.11", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4283,7 +4294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.11", "ryu", "serde", ] @@ -4297,7 +4308,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "toml 0.7.4", + "toml", "trackable", ] @@ -4311,22 +4322,22 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot", "serial_test_derive 2.0.0", ] [[package]] name = "serial_test" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" dependencies = [ - "dashmap", "futures", - "lazy_static", "log", - "parking_lot 0.12.1", - "serial_test_derive 3.0.0", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive 3.1.1", ] [[package]] @@ -4337,18 +4348,28 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "serial_test_derive" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", ] [[package]] @@ -4362,12 +4383,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.10.8" @@ -4379,33 +4394,20 @@ dependencies = [ "digest", ] -[[package]] -name = "sha256" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7895c8ae88588ccead14ff438b939b0c569cd619116f14b4d13fdff7b8333386" -dependencies = [ - "async-trait", - "bytes", - "hex", - "sha2", - "tokio", -] - [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -4417,14 +4419,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core", + "rand_core 0.6.4", ] [[package]] -name = "similar" -version = "2.3.0" +name = "simd-json" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" +dependencies = [ + "getrandom 0.2.15", + "halfbrown", + "lexical-core", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "simple_asn1" @@ -4439,39 +4463,29 @@ dependencies = [ ] [[package]] -name = "sketches-ddsketch" -version = "0.2.1" +name = "siphasher" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "sketches-ddsketch" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" dependencies = [ "serde", ] [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] -[[package]] -name = "sled" -version = "0.34.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" -dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot 0.11.2", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -4491,43 +4505,33 @@ dependencies = [ [[package]] name = "snafu" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +checksum = "418b8136fec49956eba89be7da2847ec1909df92a9ae4178b5ff0ff092c8d95e" dependencies = [ "snafu-derive", ] [[package]] name = "snafu-derive" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +checksum = "1a4812a669da00d17d8266a0439eddcacbc88b17f732f927e52eeb9d196f7fb5" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4545,6 +4549,17 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spinners" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ef947f358b9c238923f764c72a4a9d42f2d637c46e059dbd319d6e7cfb4f82" +dependencies = [ + "lazy_static", + "maplit", + "strum 0.24.1", +] + [[package]] name = "spki" version = "0.7.3" @@ -4557,9 +4572,9 @@ dependencies = [ [[package]] name = "sql_query_builder" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b371e496dc275fae413896ef31160eaeb949df66a942245cf3f37fb741389611" +checksum = "a85dbaf3c8d08abe8a95a51860550236a07bd6fc097e2bff054ad8c2bf9a0df5" [[package]] name = "sqlformat" @@ -4575,8 +4590,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4588,8 +4602,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "ahash", "atoi", @@ -4613,8 +4626,6 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls 0.21.10", - "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -4625,14 +4636,12 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots", ] [[package]] name = "sqlx-macros" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "proc-macro2", "quote", @@ -4644,12 +4653,11 @@ dependencies = [ [[package]] name = "sqlx-macros-core" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -4670,12 +4678,11 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.0", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "bytes", "chrono", @@ -4691,13 +4698,13 @@ dependencies = [ "hex", "hkdf", "hmac", - "itoa", + "itoa 1.0.11", "log", "md-5", "memchr", "once_cell", "percent-encoding", - "rand", + "rand 0.8.5", "rsa", "serde", "sha1", @@ -4713,12 +4720,11 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.0", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "chrono", "crc", @@ -4732,12 +4738,12 @@ dependencies = [ "hkdf", "hmac", "home", - "itoa", + "itoa 1.0.11", "log", "md-5", "memchr", "once_cell", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha2", @@ -4752,8 +4758,7 @@ dependencies = [ [[package]] name = "sqlx-sqlite" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a8f2cbc4a7c3c7b4e133" dependencies = [ "atoi", "chrono", @@ -4805,21 +4810,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" [[package]] -name = "stringprep" -version = "0.1.4" +name = "string_cache" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", ] [[package]] -name = "strsim" -version = "0.9.3" +name = "string_cache_codegen" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] [[package]] name = "strsim" @@ -4827,13 +4852,28 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.3", +] + +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros 0.26.2", ] [[package]] @@ -4842,13 +4882,26 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.66", +] + [[package]] name = "subtle" version = "2.5.0" @@ -4868,9 +4921,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -4891,9 +4944,9 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sysinfo" -version = "0.29.8" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10ed79c22663a35a255d289a7fdcb43559fc77ff15df5ce6c341809e7867528" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4927,51 +4980,48 @@ dependencies = [ [[package]] name = "tabby" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "assert-json-diff", + "async-openai", "async-stream", "async-trait", "axum", "axum-extra", "axum-prometheus", - "cached", "chrono", "clap", + "color-eyre", "futures", "http-api-bindings", "hyper 1.3.1", "insta", "lazy_static", - "llama-cpp-bindings", - "minijinja", + "llama-cpp-server", "nvml-wrapper", "openssl", - "parse-git-url", - "regex", - "reqwest 0.12.4", + "reqwest", "reqwest-eventsource", "serde", - "serde-jsonlines 0.5.0", + "serde-jsonlines", "serde_json", "serdeconv", - "serial_test 3.0.0", + "serial_test 3.1.1", + "spinners", "strfmt", - "strum", + "strum 0.24.1", "sysinfo", "tabby-common", "tabby-download", "tabby-inference", - "tabby-scheduler", "tabby-webserver", "tantivy", - "textdistance", "thiserror", "tokio", "tower-http", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber", "utoipa", "utoipa-swagger-ui", "uuid", @@ -4980,30 +5030,54 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "async-trait", - "glob", + "axum", + "axum-extra", + "chrono", + "derive_builder", + "hash-ids", "home", "lazy_static", - "reqwest 0.12.4", + "parse-git-url", + "reqwest", "serde", - "serde-jsonlines 0.4.0", "serde_json", "serdeconv", "tantivy", "temp_testdir", "thiserror", "tokio", + "tracing", "url", "utoipa", "uuid", ] +[[package]] +name = "tabby-crawler" +version = "0.18.0" +dependencies = [ + "anyhow", + "async-stream", + "futures", + "htmd", + "logkit", + "readable-readability", + "regex", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-test", + "url", +] + [[package]] name = "tabby-db" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "assert_matches", @@ -5011,6 +5085,7 @@ dependencies = [ "chrono", "hash-ids", "lazy_static", + "serde", "sql_query_builder", "sqlx", "tabby-db-macros", @@ -5020,88 +5095,123 @@ dependencies = [ [[package]] name = "tabby-db-macros" -version = "0.11.1" +version = "0.18.0" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "tabby-download" -version = "0.11.1" +version = "0.18.0" dependencies = [ "aim-downloader", "anyhow", - "sha256", "tabby-common", "tokio-retry", "tracing", ] [[package]] -name = "tabby-inference" -version = "0.11.1" +name = "tabby-git" +version = "0.18.0" +dependencies = [ + "anyhow", + "assert_matches", + "async-stream", + "axum", + "futures", + "git2", + "grep", + "ignore", + "mime_guess", + "nucleo", + "serde", + "serde_json", + "temp_testdir", + "tokio", + "tracing", +] + +[[package]] +name = "tabby-index" +version = "0.18.0" dependencies = [ "anyhow", "async-stream", "async-trait", - "dashmap", - "derive_builder 0.12.0", + "chrono", "futures", - "tabby-common", - "trie-rs", -] - -[[package]] -name = "tabby-scheduler" -version = "0.11.1" -dependencies = [ - "anyhow", - "async-trait", - "cargo-lock", - "file-rotate", + "git2", "ignore", - "kdam", - "kv", + "insta", "lazy_static", - "npm-package-json", - "package-lock-json-parser", - "requirements", + "logkit", "serde", - "serde-jsonlines 0.4.0", "serde_json", - "serdeconv", + "serial_test 3.1.1", "tabby-common", + "tabby-inference", "tantivy", "temp_testdir", "text-splitter", "tokio", - "tokio-cron-scheduler", "tracing", + "tracing-subscriber", "tracing-test", "tree-sitter-c", "tree-sitter-c-sharp", "tree-sitter-cpp", + "tree-sitter-elixir", "tree-sitter-go", "tree-sitter-java", "tree-sitter-kotlin", + "tree-sitter-lua", "tree-sitter-python", "tree-sitter-ruby", "tree-sitter-rust", "tree-sitter-solidity", "tree-sitter-tags", "tree-sitter-typescript", - "yarn-lock-parser", +] + +[[package]] +name = "tabby-index-cli" +version = "0.18.0" +dependencies = [ + "anyhow", + "clap", + "serde", + "serde_json", + "tabby-common", + "tantivy", +] + +[[package]] +name = "tabby-inference" +version = "0.18.0" +dependencies = [ + "anyhow", + "async-openai", + "async-stream", + "async-trait", + "dashmap", + "derive_builder", + "futures", + "reqwest", + "secrecy", + "tabby-common", + "trie-rs", ] [[package]] name = "tabby-schema" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", "async-trait", "axum", - "base64 0.22.0", + "base64 0.22.1", "chrono", "futures", "hash-ids", @@ -5109,71 +5219,66 @@ dependencies = [ "lazy_static", "regex", "serde", - "strum", + "strum 0.24.1", "tabby-common", "tabby-db", "thiserror", "tokio", "tracing", + "url", "validator", ] -[[package]] -name = "tabby-search" -version = "0.11.1" -dependencies = [ - "anyhow", - "git2", - "nucleo", - "temp_testdir", -] - [[package]] name = "tabby-webserver" -version = "0.11.1" +version = "0.18.0" dependencies = [ "anyhow", - "apalis", "argon2", "assert_matches", + "async-openai", + "async-stream", "async-trait", "axum", "axum-extra", "bincode", "chrono", + "cron", "fs_extra", "futures", "gitlab", "hyper 1.3.1", - "hyper-util", + "insta", "jsonwebtoken", "juniper", "juniper_axum", "juniper_graphql_ws", "lazy_static", "lettre", + "logkit", "mime_guess", "octocrab", "pin-project", "querystring", - "reqwest 0.12.4", + "reqwest", "rust-embed", "serde", "serde_json", - "serial_test 3.0.0", + "serial_test 3.1.1", + "strum 0.24.1", "tabby-common", + "tabby-crawler", "tabby-db", + "tabby-git", + "tabby-index", + "tabby-inference", "tabby-schema", - "tabby-search", "tarpc", "temp_testdir", "thiserror", "tokio", "tokio-tungstenite", - "tower", - "tower-http", "tracing", - "unicase", "url", "urlencoding", "uuid", @@ -5181,14 +5286,12 @@ dependencies = [ [[package]] name = "tantivy" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d4675fed6fe2218ce11445374e181e864a8ffd0f28e7e0591ccfc38cd000ae" +version = "0.23.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "aho-corasick", "arc-swap", - "async-trait", - "base64 0.21.5", + "base64 0.22.1", "bitpacking", "byteorder", "census", @@ -5196,17 +5299,16 @@ dependencies = [ "crossbeam-channel", "downcast-rs", "fastdivide", + "fnv", "fs4", "htmlescape", - "itertools 0.11.0", + "itertools 0.13.0", "levenshtein_automata", "log", "lru", "lz4_flex", "measure_time", "memmap2", - "murmurhash32", - "num_cpus", "once_cell", "oneshot", "rayon", @@ -5233,22 +5335,20 @@ dependencies = [ [[package]] name = "tantivy-bitpacker" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecb164321482301f514dd582264fa67f70da2d7eb01872ccd71e35e0d96655a" +version = "0.6.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "bitpacking", ] [[package]] name = "tantivy-columnar" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d85f8019af9a78b3118c11298b36ffd21c2314bd76bbcd9d12e00124cbb7e70" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ + "downcast-rs", "fastdivide", - "fnv", - "itertools 0.11.0", + "itertools 0.13.0", "serde", "tantivy-bitpacker", "tantivy-common", @@ -5258,9 +5358,8 @@ dependencies = [ [[package]] name = "tantivy-common" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4a3a975e604a2aba6b1106a04505e1e7a025e6def477fab6e410b4126471e1" +version = "0.7.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "async-trait", "byteorder", @@ -5271,30 +5370,29 @@ dependencies = [ [[package]] name = "tantivy-fst" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3c506b1a8443a3a65352df6382a1fb6a7afe1a02e871cee0d25e2c3d5f3944" +checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" dependencies = [ "byteorder", - "regex-syntax 0.6.29", + "regex-syntax 0.8.3", "utf8-ranges", ] [[package]] name = "tantivy-query-grammar" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d39c5a03100ac10c96e0c8b07538e2ab8b17da56434ab348309b31f23fada77" +version = "0.22.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "nom", ] [[package]] name = "tantivy-sstable" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0c1bb43e5e8b8e05eb8009610344dbf285f06066c844032fbb3e546b3c71df" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ + "tantivy-bitpacker", "tantivy-common", "tantivy-fst", "zstd", @@ -5302,19 +5400,18 @@ dependencies = [ [[package]] name = "tantivy-stacker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c078595413f13f218cf6f97b23dcfd48936838f1d3d13a1016e05acd64ed6c" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "murmurhash32", + "rand_distr", "tantivy-common", ] [[package]] name = "tantivy-tokenizer-api" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347b6fb212b26d3505d224f438e3c4b827ab8bd847fe9953ad5ac6b8f9443b66" +version = "0.3.0" +source = "git+https://github.com/quickwit-oss/tantivy?rev=4143d31#4143d31865cbae9a9a7a286b0420a95814408ec7" dependencies = [ "serde", ] @@ -5331,7 +5428,7 @@ dependencies = [ "humantime", "opentelemetry", "pin-project", - "rand", + "rand 0.8.5", "serde", "static_assertions", "tarpc-plugins", @@ -5362,82 +5459,85 @@ checksum = "921f1e9c427802414907a48b21a6504ff6b3a15a1a3cf37e699590949ad9befc" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 1.9.0", - "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix 0.38.17", - "windows-sys 0.48.0", -] - [[package]] name = "text-splitter" -version = "0.10.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5315f993b00372fd909fcf8587535e65f03ac5fd9400f49dd72ce1f6be23cf" +checksum = "2ab9dc04b7cf08eb01c07c272bf699fa55679a326ddf7dd075e14094efc80fb9" dependencies = [ "ahash", "auto_enums", "either", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "regex", + "strum 0.26.2", + "thiserror", + "tree-sitter", "unicode-segmentation", ] [[package]] -name = "textdistance" -version = "1.0.2" +name = "thin-slice" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -5450,7 +5550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa", + "itoa 1.0.11", "libc", "num-conv", "num_threads", @@ -5493,38 +5593,23 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] -[[package]] -name = "tokio-cron-scheduler" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2c1fd54a857b29c6cd1846f31903d0ae8e28175615c14a277aed45c58d8e27" -dependencies = [ - "chrono", - "cron", - "num-derive", - "num-traits", - "tokio", - "tracing", - "uuid", -] - [[package]] name = "tokio-macros" version = "2.2.0" @@ -5533,7 +5618,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -5553,17 +5638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.10", + "rand 0.8.5", "tokio", ] @@ -5573,7 +5648,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.4", + "rustls", "rustls-pki-types", "tokio", ] @@ -5592,9 +5667,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5615,36 +5690,26 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -5654,20 +5719,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -5697,21 +5762,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "bytes", "futures-util", "http 1.1.0", "http-body 1.0.0", "http-body-util", - "http-range-header", - "httpdate", "iri-string", - "mime", - "mime_guess", - "percent-encoding", "pin-project-lite", "tokio", - "tokio-util", "tower", "tower-layer", "tower-service", @@ -5732,11 +5791,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5745,42 +5803,43 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", ] [[package]] -name = "tracing-futures" -version = "0.2.5" +name = "tracing-error" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", + "tracing-subscriber", ] [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5794,48 +5853,16 @@ dependencies = [ "opentelemetry", "tracing", "tracing-core", - "tracing-subscriber 0.3.17", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", + "tracing-subscriber", ] [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", "regex", @@ -5849,21 +5876,21 @@ dependencies = [ [[package]] name = "tracing-test" -version = "0.1.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b48778c2d401c6a7fcf38a0e3c55dc8e8e753cbd381044a8cdb6fd69a29f53" +checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" dependencies = [ "lazy_static", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", "tracing-test-macro", ] [[package]] name = "tracing-test-macro" -version = "0.1.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49adbab879d2e0dd7f75edace5f0ac2156939ecb7e6a1e8fa14e53728328c48" +checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" dependencies = [ "lazy_static", "quote", @@ -5891,9 +5918,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.20.10" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" dependencies = [ "cc", "regex", @@ -5901,8 +5928,8 @@ dependencies = [ [[package]] name = "tree-sitter-c" -version = "0.20.6" -source = "git+https://github.com/tree-sitter/tree-sitter-c/?rev=212a80f#212a80f86452bb1316324fa0db730cf52f29e05a" +version = "0.21.3" +source = "git+https://github.com/tree-sitter/tree-sitter-c/?rev=00ed08f#00ed08f1a6c18141bfd7a81638e4d239a0bb55cc" dependencies = [ "cc", "tree-sitter", @@ -5910,9 +5937,9 @@ dependencies = [ [[package]] name = "tree-sitter-c-sharp" -version = "0.20.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ab3dc608f34924fa9e10533a95f62dbc14b6de0ddd7107722eba66fe19ae31" +checksum = "ff899037068a1ffbb891891b7e94db1400ddf12c3d934b85b8c9e30be5cd18da" dependencies = [ "cc", "tree-sitter", @@ -5920,8 +5947,18 @@ dependencies = [ [[package]] name = "tree-sitter-cpp" -version = "0.20.3" -source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=a714740#a71474021410973b29bfe99440d57bcd750246b1" +version = "0.22.1" +source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=d29fbff#d29fbff09a8c9ff4f3074de2595dfca12cb33da9" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-elixir" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70" dependencies = [ "cc", "tree-sitter", @@ -5929,9 +5966,9 @@ dependencies = [ [[package]] name = "tree-sitter-go" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad6d11f19441b961af2fda7f12f5d0dac325f6d6de83836a1d3750018cc5114" +checksum = "55cb318be5ccf75f44e054acf6898a5c95d59b53443eed578e16be0cd7ec037f" dependencies = [ "cc", "tree-sitter", @@ -5939,9 +5976,9 @@ dependencies = [ [[package]] name = "tree-sitter-java" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adc5696bf5abf761081d7457d2bb82d0e3b28964f4214f63fd7e720ef462653" +checksum = "33bc21adf831a773c075d9d00107ab43965e6a6ea7607b47fd9ec6f3db4b481b" dependencies = [ "cc", "tree-sitter", @@ -5949,9 +5986,19 @@ dependencies = [ [[package]] name = "tree-sitter-kotlin" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5f367466210220a194a2d8831fc12d15aa13305e7bcdf2dba47714aa328e86" +checksum = "c88dfbb22333118a5d5c5c10b19f93d115a6fa3c8a69dd0e6a260a64f9f5a79b" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-lua" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9fe6fc87bd480e1943fc1fcb02453fb2da050e4e8ce0daa67d801544046856" dependencies = [ "cc", "tree-sitter", @@ -5959,9 +6006,9 @@ dependencies = [ [[package]] name = "tree-sitter-python" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda114f58048f5059dcf158aff691dffb8e113e6d2b50d94263fd68711975287" +checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" dependencies = [ "cc", "tree-sitter", @@ -5969,9 +6016,9 @@ dependencies = [ [[package]] name = "tree-sitter-ruby" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ac30cbb1560363ae76e1ccde543d6d99087421e228cc47afcec004b86bb711a" +checksum = "c0031f687c0772f2dad7b77104c43428611099a1804c81244ada21560f41f0b1" dependencies = [ "cc", "tree-sitter", @@ -5979,9 +6026,9 @@ dependencies = [ [[package]] name = "tree-sitter-rust" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797842733e252dc11ae5d403a18060bf337b822fc2ae5ddfaa6ff4d9cc20bda6" +checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" dependencies = [ "cc", "tree-sitter", @@ -5989,8 +6036,8 @@ dependencies = [ [[package]] name = "tree-sitter-solidity" -version = "0.0.3" -source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=b239a95#b239a95f94cfcc6e7b3e961bc73a28d55e214f02" +version = "1.2.6" +source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=0e86ae647bda22c9bee00ec59752df7b3d3b000b#0e86ae647bda22c9bee00ec59752df7b3d3b000b" dependencies = [ "cc", "tree-sitter", @@ -5998,9 +6045,9 @@ dependencies = [ [[package]] name = "tree-sitter-tags" -version = "0.20.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05" +checksum = "34380416097ab36d1b4cd83f887d9e150ea4feaeb6ee9a5ecfe53d26839acc69" dependencies = [ "memchr", "regex", @@ -6010,9 +6057,9 @@ dependencies = [ [[package]] name = "tree-sitter-typescript" -version = "0.20.3" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75049f0aafabb2aac205d7bb24da162b53dcd0cfb326785f25a2f32efa8071a" +checksum = "f07523e51e3b88529360a89038c0cca7ee877db40a40141514eece8b4cddcbb4" dependencies = [ "cc", "tree-sitter", @@ -6029,9 +6076,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -6045,7 +6092,7 @@ dependencies = [ "http 1.1.0", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", "thiserror", "url", @@ -6054,9 +6101,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -6064,17 +6111,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "ulid" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" -dependencies = [ - "getrandom", - "rand", - "web-time", -] - [[package]] name = "unicase" version = "2.7.0" @@ -6086,25 +6122,31 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +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-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -6113,9 +6155,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode_categories" @@ -6145,16 +6187,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", "serde", ] [[package]] name = "url-parse" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d375da66174ba9b3697f36468fb6b9a981074537569a87ad2dc43de2a598063" +checksum = "865ece61c15cae30f180636ae551daa25c318c181938da07f3ab3ed06750bdd2" dependencies = [ "regex", ] @@ -6185,9 +6227,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "4.2.0" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" +checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" dependencies = [ "indexmap 2.2.6", "serde", @@ -6197,15 +6239,15 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" +checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -6226,35 +6268,35 @@ dependencies = [ [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom", - "rand", + "getrandom 0.2.15", + "rand 0.8.5", "serde", "uuid-macro-internal", ] [[package]] name = "uuid-macro-internal" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e" +checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "validator" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" dependencies = [ - "idna 0.4.0", - "lazy_static", + "idna", + "once_cell", "regex", "serde", "serde_derive", @@ -6265,28 +6307,16 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" +checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" dependencies = [ - "if_chain", - "lazy_static", + "darling 0.20.9", + "once_cell", "proc-macro-error", "proc-macro2", "quote", - "regex", - "syn 1.0.109", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" -dependencies = [ - "proc-macro2", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -6295,6 +6325,18 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-trait" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" +dependencies = [ + "float-cmp", + "halfbrown", + "itoa 1.0.11", + "ryu", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -6303,11 +6345,12 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.2.4" +version = "8.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" dependencies = [ "anyhow", + "cfg-if", "rustversion", "time", ] @@ -6336,14 +6379,19 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6351,10 +6399,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.87" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6362,24 +6416,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6389,9 +6443,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6399,22 +6453,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -6431,19 +6485,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6451,15 +6495,34 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] [[package]] name = "winapi" @@ -6479,11 +6542,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -6498,31 +6561,26 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-core", + "windows-targets 0.52.5", ] [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.52.5", ] [[package]] @@ -6531,142 +6589,148 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "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.5", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows_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.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winreg" version = "0.52.0" @@ -6678,61 +6742,59 @@ dependencies = [ ] [[package]] -name = "wrapcenum-derive" -version = "0.4.0" +name = "winsafe" +version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "wrapcenum-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e" dependencies = [ - "darling 0.10.2", + "darling 0.20.9", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "xml5ever" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "7c376f76ed09df711203e20c3ef5ce556f0166fa03d39590016c0fd625437fad" dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yarn-lock-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0603904f8482a1a2a038c9f89c75b0e435392513c3abd3d284123381bbe51f" -dependencies = [ - "nom", - "thiserror", + "log", + "mac", + "markup5ever 0.12.1", ] [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" @@ -6748,30 +6810,28 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index df01b5c4940a..03179482b4d8 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -1,28 +1,29 @@ -{ config -, lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, stdenv +{ + config, + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + stdenv, -, git -, openssl -, pkg-config -, protobuf + git, + openssl, + pkg-config, + protobuf, -, llama-cpp + llama-cpp, -, autoAddDriverRunpath -, cudaSupport ? config.cudaSupport -, cudaPackages ? { } + autoAddDriverRunpath, + cudaSupport ? config.cudaSupport, -, rocmSupport ? config.rocmSupport + rocmSupport ? config.rocmSupport, -, darwin -, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 + darwin, + metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, # one of [ null "cpu" "rocm" "cuda" "metal" ]; -, acceleration ? null + acceleration ? null, + versionCheckHook, }: let @@ -32,8 +33,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.11.1"; - + version = "0.18.0"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -41,32 +41,49 @@ let (optional metalSupport "metal") ]; - warnIfMultipleAccelerationMethods = configured: (let - len = builtins.length configured; - result = if len == 0 then "cpu" else (builtins.head configured); - in - lib.warnIf (len > 1) '' - building tabby with multiple acceleration methods enabled is not - supported; falling back to `${result}` - '' - result - ); + warnIfMultipleAccelerationMethods = + configured: + ( + let + len = builtins.length configured; + result = if len == 0 then "cpu" else (builtins.head configured); + in + lib.warnIf (len > 1) '' + building tabby with multiple acceleration methods enabled is not + supported; falling back to `${result}` + '' result + ); # If user did not not override the acceleration attribute, then try to use one of # - nixpkgs.config.cudaSupport # - nixpkgs.config.rocmSupport # - metal if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # !! warn if multiple acceleration methods are enabled and default to the first one in the list - featureDevice = if (builtins.isNull acceleration) then (warnIfMultipleAccelerationMethods availableAccelerations) else acceleration; + featureDevice = + if (builtins.isNull acceleration) then + (warnIfMultipleAccelerationMethods availableAccelerations) + else + acceleration; - warnIfNotLinux = api: (lib.warnIfNot stdenv.hostPlatform.isLinux - "building tabby with `${api}` is only supported on linux; falling back to cpu" - stdenv.hostPlatform.isLinux); - warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu" - (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)); + warnIfNotLinux = + api: + (lib.warnIfNot stdenv.hostPlatform.isLinux + "building tabby with `${api}` is only supported on linux; falling back to cpu" + stdenv.hostPlatform.isLinux + ); + warnIfNotDarwinAarch64 = + api: + (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu" + (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + ); - validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ "cpu" "rocm" "cuda" "metal" ]; + validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ + "cpu" + "rocm" + "cuda" + "metal" + ]; # TODO(ghthor): there is a bug here where featureDevice could be cuda, but enableCuda is false # The would result in a startup failure of the service module. @@ -87,14 +104,21 @@ let }; # TODO(ghthor): some of this can be removed - darwinBuildInputs = [ llamaccpPackage ] - ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals enableMetal [ Metal MetalKit ]); + darwinBuildInputs = + [ llamaccpPackage ] + ++ optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Foundation + Accelerate + CoreVideo + CoreGraphics + ] + ++ optionals enableMetal [ + Metal + MetalKit + ] + ); cudaBuildInputs = [ llamaccpPackage ]; rocmBuildInputs = [ llamaccpPackage ]; @@ -107,55 +131,85 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; - rev = "v${version}"; - hash = "sha256-OgAE526aW3mVqf6fVmBmL5/B4gH9B54QLEITQk9Kgsg="; + rev = "refs/tags/v${version}"; + hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "apalis-0.5.1" = "sha256-hGvVuSy32lSTR5DJdiyf8q1sXbIeuLSGrtyq6m2QlUQ="; - "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; - "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; - "tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0="; + "ollama-rs-0.1.9" = "sha256-d6sKUxc8VQbRkVqMOeNFqDdKesq5k32AQShK67y2ssg="; + "oneshot-0.1.6" = "sha256-PmYuHuNTqToMyMHPRFDUaHUvFkVftx9ZCOBwXj+4Hc4="; + "ownedbytes-0.7.0" = "sha256-p0+ohtW0VLmfDTZw/LfwX2gYfuYuoOBcE+JsguK7Wn8="; + "sqlx-0.7.4" = "sha256-tcISzoSfOZ0jjNgGpuPPxjMxmBUPw/5FVDoALZEAHKY="; + "tree-sitter-c-0.21.3" = "sha256-ucbHLS2xyGo1uyKZv/K1HNXuMo4GpTY327cgdVS9F3c="; + "tree-sitter-cpp-0.22.1" = "sha256-3akSuQltFMF6I32HwRU08+Hcl9ojxPGk2ZuOX3gAObw="; + "tree-sitter-solidity-1.2.6" = "sha256-S00hdzMoIccPYBEvE092/RIMnG8YEnDGk6GJhXlr4ng="; }; }; # https://github.com/TabbyML/tabby/blob/v0.7.0/.github/workflows/release.yml#L39 - cargoBuildFlags = [ - "--release" - "--package" "tabby" - ] ++ optionals enableRocm [ - "--features" "rocm" - ] ++ optionals enableCuda [ - "--features" "cuda" + cargoBuildFlags = + [ + # Don't need to build llama-cpp-server (included in default build) + "--no-default-features" + "--features" + "ee" + "--package" + "tabby" + ] + ++ optionals enableRocm [ + "--features" + "rocm" + ] + ++ optionals enableCuda [ + "--features" + "cuda" + ]; + + nativeInstallCheckInputs = [ + versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; - OPENSSL_NO_VENDOR = 1; + nativeBuildInputs = + [ + git + pkg-config + protobuf + ] + ++ optionals enableCuda [ + autoAddDriverRunpath + ]; - nativeBuildInputs = [ - pkg-config - protobuf - git - ] ++ optionals enableCuda [ - autoAddDriverRunpath - ]; + buildInputs = + [ openssl ] + ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs + ++ optionals enableCuda cudaBuildInputs + ++ optionals enableRocm rocmBuildInputs; - buildInputs = [ openssl ] - ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs - ++ optionals enableCuda cudaBuildInputs - ++ optionals enableRocm rocmBuildInputs - ; + postInstall = '' + # NOTE: Project contains a subproject for building llama-server + # But, we already have a derivation for this + ln -s ${lib.getExe' llama-cpp "llama-server"} $out/bin/llama-server + ''; - env.LLAMA_CPP_LIB = "${lib.getLib llamaccpPackage}/lib"; - patches = [ ./0001-nix-build-use-nix-native-llama-cpp-package.patch ]; + env = { + OPENSSL_NO_VENDOR = 1; + }; # Fails with: # file cannot create directory: /var/empty/local/lib64/cmake/Llama doCheck = false; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; + }; meta = with lib; { homepage = "https://github.com/TabbyML/tabby"; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 547af6be14c3..77f8cf6e5f8b 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, alsa-utils, copyDesktopItems, - electron_30, + electron_32, makeDesktopItem, makeWrapper, nix-update-script, @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-UNe4stYEOTcQc+ap1/v9EXjHTwKvLYd4t8EPuojDyqw="; + hash = "sha256-fSZ94Px0NuxUZqc9cHE6czG/VzNsWp+UXllq7kEQvtI="; }; - npmDepsHash = "sha256-OpoPXcSiHnK4UYFimY+yOM6M3dAOcvZ82DdGc++oNLM="; + npmDepsHash = "sha256-MfPdOqxiMDsvxsS3yWukRokDitqWQpTpK407xVX461o="; nativeBuildInputs = [ makeWrapper @@ -42,7 +42,7 @@ buildNpmPackage rec { buildPhase = '' runHook preBuild - cp -r ${electron_30.dist} electron-dist + cp -r ${electron_32.dist} electron-dist chmod -R u+w electron-dist npm exec electron-builder -- \ @@ -50,7 +50,7 @@ buildNpmPackage rec { -c.npmRebuild=true \ -c.asarUnpack="**/*.node" \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron_30.version} + -c.electronVersion=${electron_32.version} runHook postBuild ''; @@ -72,7 +72,7 @@ buildNpmPackage rec { popd # Linux needs 'aplay' for notification sounds - makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \ + makeWrapper '${lib.getExe electron_32}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ lib.makeBinPath [ alsa-utils @@ -109,6 +109,8 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; + versionCheckProgramArg = [ "--version" ]; + meta = { description = "Unofficial Microsoft Teams client for Linux"; mainProgram = "teams-for-linux"; diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 58dfb320bd9e..3b6f2c4c7046 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-X7JGzTaTm7CE5+mTvnV93d5Hx2A1vF+aufmC5/xWRtc="; + hash = "sha256-9RZmLs95dHZw5hgob5+iogxb6DV0FqVaY+PavGFpXj4="; }; vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; diff --git a/pkgs/by-name/tu/turbo/package.nix b/pkgs/by-name/tu/turbo/package.nix index c1966e982117..bfc1255eb029 100644 --- a/pkgs/by-name/tu/turbo/package.nix +++ b/pkgs/by-name/tu/turbo/package.nix @@ -10,10 +10,9 @@ disableUpdateNotifier ? true, }: -symlinkJoin rec { +symlinkJoin { pname = "turbo"; inherit (turbo-unwrapped) version; - name = "${pname}-${version}"; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index 074bf872f987..b1283ee26342 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "uplosi"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "edgelesssys"; repo = pname; rev = "v${version}"; - hash = "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk="; + hash = "sha256-MsZ4Bl8sW1dZUB9cYPsaLtc8P8RRx4hafSbNB4vXqi4="; }; vendorHash = "sha256-o7PPgW3JL47G6Na5n9h3RasRMfU25FD1U/wCMaydRmc="; diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index b1ca9c285fb7..095c395c71f5 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.12.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error rev = "refs/tags/v${version}"; - hash = "sha256-uNmjb1fj9bMawvNgITxu/RIZeLEn8JzIpFbSMrsmFIQ="; + hash = "sha256-t/KbwyxInMvxsICdh0kix27+MKre480+I/KkbwxLg1M="; }; - vendorHash = "sha256-Yxzj3IAYp6C7qLbV2RV4lWZRDSheauZXvd+p5B5Y3qA="; + vendorHash = "sha256-6ay7aGFf50txrRZbjOuG2rVeetVo0SWgpURLmFyhszA="; CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index 65934fb56b8c..357c68d3c8c7 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/velero completion bash > velero.bash $out/bin/velero completion zsh > velero.zsh installShellCompletion velero.{bash,zsh} diff --git a/pkgs/by-name/x5/x509-limbo/package.nix b/pkgs/by-name/x5/x509-limbo/package.nix deleted file mode 100644 index 0971d8b6cd45..000000000000 --- a/pkgs/by-name/x5/x509-limbo/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -python3.pkgs.buildPythonPackage { - pname = "x509-limbo"; - version = "unstable-2024-03-13"; - pyproject = true; - - src = fetchFromGitHub { - owner = "C2SP"; - repo = "x509-limbo"; - rev = "a04fb05cf132e1405f71c12616cf0aead829909a"; - hash = "sha256-TA4ciHkXg/RKzcIs2bwpx7CxsQDyQMG636Rr74xPsBA="; - }; - - dependencies = with python3.pkgs; [ - flit-core - - requests - pydantic - jinja2 - cryptography - pyopenssl - pyyaml - certvalidator - certifi - ]; - - postInstall = '' - mkdir -p $out/share - cp limbo.json $out/share/ - - wrapProgram $out/bin/limbo \ - --append-flags "--limbo $out/share/limbo.json" - ''; - - meta = with lib; { - homepage = "https://x509-limbo.com/"; - description = "Suite of testvectors for X.509 certificate path validation and tools for building them"; - mainProgram = "limbo"; - - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ baloo ]; - }; -} diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index 7a61d509a924..bf718efa9f6d 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "xeol"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; rev = "refs/tags/v${version}"; - hash = "sha256-5QlHfchVRFNpU/sBTS9AWOENU86jBatF6KI97NoJa50="; + hash = "sha256-4fMH07XKMnpX54mS9pAuTBiHcP6nXj8vpuk3f/3ik+k="; }; vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs="; diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 9a7a5be0dcfb..671d7c086bd8 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -250,7 +250,6 @@ dependencies = [ "serde_json", "strum 0.25.0", "thiserror", - "tokio", "util", ] @@ -341,9 +340,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "async-fs 2.1.2", "async-net 2.0.0", @@ -395,7 +394,7 @@ dependencies = [ "gpui", "handlebars 4.5.0", "heed", - "html_to_markdown 0.1.0", + "html_to_markdown", "http_client", "indexed_docs", "indoc", @@ -535,9 +534,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "deflate64", "flate2", @@ -839,15 +838,14 @@ dependencies = [ [[package]] name = "async-stripe" -version = "0.39.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d670cf4d47a1b8ffef54286a5625382e360a34ee76902fd93ad8c7032a0c30" +version = "0.40.0" +source = "git+https://github.com/zed-industries/async-stripe?rev=3672dd4efb7181aa597bf580bf5a2f5d23db6735#3672dd4efb7181aa597bf580bf5a2f5d23db6735" dependencies = [ "chrono", "futures-util", "http-types", - "hyper", - "hyper-rustls", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "serde", "serde_json", "serde_path_to_error", @@ -905,9 +903,9 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +checksum = "3609af4bbf701ddaf1f6bb4e6257dff4ff8932327d0e685d3f653724c258b1ac" dependencies = [ "async-std", "async-tls", @@ -915,7 +913,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite", - "tungstenite 0.20.1", + "tungstenite 0.21.0", ] [[package]] @@ -946,7 +944,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-sink", "futures-util", "memchr", @@ -1060,7 +1058,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", "hex", "http 0.2.12", @@ -1099,7 +1097,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", "http 0.2.12", "http-body 0.4.6", @@ -1130,7 +1128,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", "hex", "hmac", @@ -1160,7 +1158,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "once_cell", "regex-lite", @@ -1182,7 +1180,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "once_cell", "regex-lite", @@ -1223,7 +1221,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crypto-bigint 0.5.5", "form_urlencoded", "hex", @@ -1260,7 +1258,7 @@ checksum = "598b1689d001c4d4dc3cb386adb07d37786783aee3ac4b324bcadac116bf3d23" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32c", "crc32fast", "hex", @@ -1280,7 +1278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32fast", ] @@ -1293,7 +1291,7 @@ dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", "futures-core", "http 0.2.12", @@ -1334,15 +1332,15 @@ dependencies = [ "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "http-body 1.0.1", "httparse", - "hyper", - "hyper-rustls", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", @@ -1359,7 +1357,7 @@ checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "http 1.1.0", "pin-project-lite", @@ -1375,7 +1373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "273dcdfd762fae3e1650b8024624e7cd50e484e37abdab73a7a706188ad34543" dependencies = [ "base64-simd", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", "futures-core", "http 0.2.12", @@ -1427,12 +1425,12 @@ dependencies = [ "axum-core", "base64 0.21.7", "bitflags 1.3.2", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "headers", "http 0.2.12", "http-body 0.4.6", - "hyper", + "hyper 0.14.30", "itoa", "matchit", "memchr", @@ -1445,7 +1443,7 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tokio-tungstenite 0.20.1", "tower", @@ -1460,7 +1458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.12", "http-body 0.4.6", @@ -1477,7 +1475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d" dependencies = [ "axum", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.12", "mime", @@ -1584,7 +1582,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.76", ] @@ -1604,7 +1602,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.76", ] @@ -1911,9 +1909,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1921,7 +1919,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "either", ] @@ -2100,12 +2098,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" -[[package]] -name = "castaway" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - [[package]] name = "cbc" version = "0.1.2" @@ -2282,9 +2274,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -2292,9 +2284,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -2359,11 +2351,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0875e527e299fc5f4faba42870bf199a39ab0bb2dbba1b8aef0a2151451130f" dependencies = [ "bstr", - "bytes 1.7.1", + "bytes 1.7.2", "clickhouse-derive", "clickhouse-rs-cityhash-sys", "futures 0.3.30", - "hyper", + "hyper 0.14.30", "hyper-tls", "lz4", "sealed", @@ -2553,6 +2545,7 @@ dependencies = [ "collections", "ctor", "dashmap 6.0.1", + "derive_more", "dev_server_projects", "editor", "env_logger", @@ -2567,9 +2560,8 @@ dependencies = [ "headless", "hex", "http_client", - "hyper", + "hyper 0.14.30", "indoc", - "isahc_http_client", "jsonwebtoken", "language", "language_model", @@ -2593,7 +2585,8 @@ dependencies = [ "release_channel", "remote", "remote_server", - "reqwest", + "reqwest 0.11.27", + "reqwest_client", "rpc", "rustc-demangle", "scrypt", @@ -2677,7 +2670,7 @@ dependencies = [ name = "collections" version = "0.1.0" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -2698,7 +2691,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "memchr", ] @@ -2995,7 +2988,7 @@ dependencies = [ "log", "rangemap", "rayon", - "rustc-hash", + "rustc-hash 1.1.0", "rustybuzz", "self_cell", "swash", @@ -3050,18 +3043,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" +checksum = "32d69b774780246008783a75edfb943eccc2487b6a43808503a07cd563f2ffde" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" +checksum = "a7d8d71c6b32c1a7cff254c5e5d7359872c1e5e610fbe963472afcddbd9cf303" dependencies = [ "serde", "serde_derive", @@ -3069,9 +3062,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" +checksum = "3ad3a906f2a3f3590ad9798d59a46959a8593258eb985af722f634723c063a2c" dependencies = [ "bumpalo", "cranelift-bforest", @@ -3085,40 +3078,40 @@ dependencies = [ "hashbrown 0.14.5", "log", "regalloc2", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" +checksum = "cd5e4ee12262a135efbef3ced4ab2153adafe4adc55f36af94f9d73be0f7505d" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" +checksum = "5b9374a2a5f060f72e3080fe1c87c9ff4bef2cbe798faae60daf276fb1a13968" [[package]] name = "cranelift-control" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" +checksum = "fba3ca2f344bb22d265a928e7c3f5f46e1a2eb41f1393bd53538d07b6ffb5293" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" +checksum = "a6aef77dfb018eed09d92d4244abe3c1c060cbbd900c24f75ddde7d75d0e781e" dependencies = [ "cranelift-bitset", "serde", @@ -3127,9 +3120,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" +checksum = "7b1d6954f03d63df1cb95d66153c97df0201862220861349bbd5f583754b1917" dependencies = [ "cranelift-codegen", "log", @@ -3139,15 +3132,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" +checksum = "f8b9b7e088b784796ea8aa5947c1cc12034c1b076a077ec2a5a287da717fa746" [[package]] name = "cranelift-native" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" +checksum = "4cab7424083d070669ff3fdeea7c5b4b5013a055aa1ee0532703f17a5f62af64" dependencies = [ "cranelift-codegen", "libc", @@ -3156,9 +3149,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" +checksum = "81a9f6d0495984eef1d753ec8748de0b216b37ade16d219f1c0f27d8188d7f77" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -3341,36 +3334,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "curl" -version = "0.4.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.5.7", - "windows-sys 0.52.0", -] - -[[package]] -name = "curl-sys" -version = "0.4.74+curl-8.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.52.0", -] - [[package]] name = "cursor-icon" version = "1.1.0" @@ -3839,9 +3802,9 @@ checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" [[package]] name = "emojis" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72f23d65b46527e461b161ab9a126c378aa2249d8a8d15718d23ab1fb4d8786" +checksum = "99e1f1df1f181f2539bac8bf027d31ca5ffbf9e559e3f2d09413b9107b5c02f4" dependencies = [ "phf", ] @@ -4032,12 +3995,12 @@ dependencies = [ "git", "gpui", "http_client", - "isahc_http_client", "language", "languages", "node_runtime", "open_ai", "project", + "reqwest_client", "semantic_index", "serde", "serde_json", @@ -4127,7 +4090,6 @@ dependencies = [ "gpui", "http_client", "indexed_docs", - "isahc_http_client", "language", "log", "lsp", @@ -4136,6 +4098,7 @@ dependencies = [ "paths", "project", "release_channel", + "reqwest_client", "schemars", "semantic_version", "serde", @@ -4145,7 +4108,6 @@ dependencies = [ "snippet_provider", "task", "theme", - "tokio", "toml 0.8.19", "ui", "url", @@ -4167,9 +4129,9 @@ dependencies = [ "env_logger", "extension", "fs", - "isahc_http_client", "language", "log", + "reqwest_client", "rpc", "serde", "serde_json", @@ -5148,9 +5110,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.14.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82" +checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c" [[package]] name = "group" @@ -5169,7 +5131,7 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "futures-core", "futures-sink", @@ -5182,6 +5144,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes 1.7.2", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.4.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -5265,7 +5246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "headers-core", "http 0.2.12", "httpdate", @@ -5297,7 +5278,7 @@ dependencies = [ "node_runtime", "postage", "project", - "rpc", + "proto", "settings", "shellexpand 2.1.2", "signal-hook", @@ -5460,25 +5441,13 @@ dependencies = [ "regex", ] -[[package]] -name = "html_to_markdown" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e608e8dd0939bfb6b516d96a5919751b835297a02230aecb88d2fc84ebebaa8a" -dependencies = [ - "anyhow", - "html5ever", - "markup5ever_rcdom", - "regex", -] - [[package]] name = "http" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -5489,7 +5458,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -5500,7 +5469,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "pin-project-lite", ] @@ -5511,7 +5480,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 1.1.0", ] @@ -5521,7 +5490,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 1.1.0", "http-body 1.0.1", @@ -5560,13 +5529,13 @@ name = "http_client" version = "0.1.0" dependencies = [ "anyhow", + "bytes 1.7.2", "derive_more", "futures 0.3.30", - "http 0.2.12", + "http 1.1.0", "log", "serde", "serde_json", - "smol", "url", ] @@ -5600,11 +5569,11 @@ version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -5618,6 +5587,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes 1.7.2", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -5626,12 +5615,30 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.30", "log", "rustls 0.21.12", "rustls-native-certs 0.6.3", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", ] [[package]] @@ -5640,13 +5647,32 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.7.1", - "hyper", + "bytes 1.7.2", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes 1.7.2", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -5775,7 +5801,7 @@ dependencies = [ "fuzzy", "gpui", "heed", - "html_to_markdown 0.1.0", + "html_to_markdown", "http_client", "indexmap 1.9.3", "indoc", @@ -5955,9 +5981,9 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46231d1db8ea8f874012b1b87efb9e968f763c577220372a9c7caadce1448da" +checksum = "c7f4c80f2df4fc64fb7fc2cff69fc034af26e6e6617ea9f1313131af464b9ca0" dependencies = [ "bincode", "crossbeam-channel", @@ -5969,7 +5995,7 @@ dependencies = [ "serde", "tempfile", "uuid", - "windows 0.48.0", + "windows 0.58.0", ] [[package]] @@ -6014,44 +6040,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "isahc" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel 1.9.0", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "encoding_rs", - "event-listener 2.5.3", - "futures-lite 1.13.0", - "http 0.2.12", - "log", - "mime", - "once_cell", - "polling 2.8.0", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - -[[package]] -name = "isahc_http_client" -version = "0.1.0" -dependencies = [ - "anyhow", - "futures 0.3.30", - "http_client", - "isahc", - "util", -] - [[package]] name = "itertools" version = "0.10.5" @@ -6385,6 +6373,7 @@ dependencies = [ "tree-sitter-c", "tree-sitter-cpp", "tree-sitter-css", + "tree-sitter-diff", "tree-sitter-go", "tree-sitter-gomod", "tree-sitter-gowork", @@ -6602,7 +6591,7 @@ dependencies = [ "prost", "prost-build", "prost-types", - "reqwest", + "reqwest 0.12.8", "serde", ] @@ -7086,7 +7075,7 @@ dependencies = [ "hexf-parse", "indexmap 2.4.0", "log", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -8405,9 +8394,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -8562,7 +8551,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost-derive", ] @@ -8572,7 +8561,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "heck 0.3.3", "itertools 0.10.5", "lazy_static", @@ -8605,7 +8594,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost", ] @@ -8734,6 +8723,54 @@ dependencies = [ "zed_actions", ] +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes 1.7.2", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.13", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes 1.7.2", + "rand 0.8.5", + "ring 0.17.8", + "rustc-hash 2.0.0", + "rustls 0.23.13", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.37" @@ -8932,6 +8969,7 @@ dependencies = [ "client", "dev_server_projects", "editor", + "file_finder", "futures 0.3.30", "fuzzy", "gpui", @@ -8939,6 +8977,7 @@ dependencies = [ "log", "menu", "ordered-float 2.10.1", + "paths", "picker", "project", "release_channel", @@ -8952,7 +8991,6 @@ dependencies = [ "task", "terminal_view", "ui", - "ui_input", "util", "workspace", ] @@ -9010,7 +9048,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] @@ -9099,6 +9137,7 @@ name = "remote_server" version = "0.1.0" dependencies = [ "anyhow", + "async-watch", "backtrace", "cargo_toml", "clap", @@ -9114,9 +9153,12 @@ dependencies = [ "log", "lsp", "node_runtime", + "paths", "project", "remote", + "reqwest_client", "rpc", + "rust-embed", "serde", "serde_json", "settings", @@ -9186,14 +9228,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper", + "hyper 0.14.30", "hyper-tls", "ipnet", "js-sys", @@ -9207,8 +9249,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 0.1.2", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tower-service", @@ -9219,6 +9261,68 @@ dependencies = [ "winreg 0.50.0", ] +[[package]] +name = "reqwest" +version = "0.12.8" +source = "git+https://github.com/zed-industries/reqwest.git?rev=fd110f6998da16bbca97b6dddda9be7827c50e29#fd110f6998da16bbca97b6dddda9be7827c50e29" +dependencies = [ + "base64 0.22.1", + "bytes 1.7.2", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.3", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "system-configuration 0.6.1", + "tokio", + "tokio-rustls 0.26.0", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry", +] + +[[package]] +name = "reqwest_client" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes 1.7.2", + "futures 0.3.30", + "gpui", + "http_client", + "log", + "reqwest 0.12.8", + "serde", + "smol", + "tokio", +] + [[package]] name = "resvg" version = "0.41.0" @@ -9305,7 +9409,7 @@ checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", - "bytes 1.7.1", + "bytes 1.7.2", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -9442,7 +9546,7 @@ dependencies = [ "async-dispatcher", "async-std", "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "data-encoding", "dirs 5.0.1", @@ -9501,7 +9605,7 @@ checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "borsh", - "bytes 1.7.1", + "bytes 1.7.2", "num-traits", "rand 0.8.5", "rkyv", @@ -9521,6 +9625,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.1" @@ -9590,10 +9700,24 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -9654,6 +9778,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.17" @@ -9962,7 +10097,6 @@ dependencies = [ "gpui", "heed", "http_client", - "isahc_http_client", "language", "language_model", "languages", @@ -9970,6 +10104,7 @@ dependencies = [ "open_ai", "parking_lot", "project", + "reqwest_client", "serde", "serde_json", "settings", @@ -10412,17 +10547,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel 1.9.0", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -10645,7 +10769,7 @@ dependencies = [ "atoi", "bigdecimal", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "crossbeam-queue", @@ -10733,7 +10857,7 @@ dependencies = [ "bigdecimal", "bitflags 2.6.0", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "digest", @@ -10873,12 +10997,12 @@ dependencies = [ "fuzzy", "gpui", "indoc", - "isahc_http_client", "language", "log", "menu", "picker", "project", + "reqwest_client", "rust-embed", "settings", "simplelog", @@ -11174,6 +11298,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + [[package]] name = "synchronoise" version = "1.0.1" @@ -11214,7 +11347,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.9.4", + "system-configuration-sys 0.6.0", ] [[package]] @@ -11227,6 +11371,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "system-deps" version = "6.2.2" @@ -11281,9 +11435,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.5.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94" +checksum = "9ec17858c2d465b2f734b798b920818a974faf0babb15d7fef81818a4b2d16f1" dependencies = [ "arrayvec", "grid", @@ -11357,7 +11511,6 @@ dependencies = [ name = "telemetry_events" version = "0.1.0" dependencies = [ - "language", "semantic_version", "serde", ] @@ -11407,6 +11560,7 @@ dependencies = [ "gpui", "libc", "rand 0.8.5", + "regex", "release_channel", "schemars", "serde", @@ -11604,7 +11758,7 @@ dependencies = [ "fancy-regex", "lazy_static", "parking_lot", - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -11767,7 +11921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "bytes 1.7.1", + "bytes 1.7.2", "libc", "mio 1.0.2", "parking_lot", @@ -11820,6 +11974,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.13", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.2" @@ -11869,11 +12034,11 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-io", "futures-sink", @@ -11978,7 +12143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ "bitflags 1.3.2", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 0.2.12", @@ -11996,7 +12161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.6.0", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 0.2.12", @@ -12053,16 +12218,6 @@ dependencies = [ "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" @@ -12158,6 +12313,16 @@ dependencies = [ "tree-sitter-language", ] +[[package]] +name = "tree-sitter-diff" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfe1e5ca280a65dfe5ba4205c1bcc84edf486464fed315db53dee6da9a335889" +dependencies = [ + "cc", + "tree-sitter-language", +] + [[package]] name = "tree-sitter-elixir" version = "0.3.0" @@ -12338,7 +12503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 0.2.12", "httparse", @@ -12357,7 +12522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 1.1.0", "httparse", @@ -12837,12 +13002,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "headers", "http 0.2.12", - "hyper", + "hyper 0.14.30", "log", "mime", "mime_guess", @@ -12978,6 +13143,19 @@ dependencies = [ "wasmparser 0.201.0", ] +[[package]] +name = "wasm-streams" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmparser" version = "0.201.0" @@ -13016,9 +13194,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" +checksum = "7e4a5b05e9f1797e557e79f0cf04348eaa7a232596939ef4762838ddf7a6127a" dependencies = [ "anyhow", "async-trait", @@ -13062,9 +13240,9 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" +checksum = "64414227e19556d4372f9688458c5673606de83473eb66cd0514d36ea8808cab" dependencies = [ "cfg-if", ] @@ -13095,9 +13273,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" +checksum = "d3ead31b73689602225742920adbcd881f5656702c1a3b4830862c0c66731727" dependencies = [ "anyhow", "proc-macro2", @@ -13110,15 +13288,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" +checksum = "ab2c778661800e1dcd8ba3e15ff042299709e0a4c512525d9cbb604a04c0421b" [[package]] name = "wasmtime-cranelift" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" +checksum = "9f7ee1f436bcf7d213ef7c2e9d44caffcd57e540ccf997d013384c2ae9b82db7" dependencies = [ "anyhow", "cfg-if", @@ -13140,9 +13318,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" +checksum = "fa8c33adfb3b9f8d6ef716bc55aea5e6b2275cd5a6721ec8c837d1cb0c471516" dependencies = [ "anyhow", "cpp_demangle", @@ -13167,9 +13345,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f39043d13c7b58db69dc9a0feb191a961e75a9ec2402aebf42de183c022bb8a" +checksum = "9f3227ed807c2dda9dd770c241023fcd6e48e6722c1c26ff79fc3604d412e884" dependencies = [ "anyhow", "cc", @@ -13182,9 +13360,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" +checksum = "fa89fc440f0edca882ba6d1890608898e6f0193afdc504c0a64478ec53622bd6" dependencies = [ "anyhow", "cfg-if", @@ -13194,15 +13372,15 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" +checksum = "682b7a5b6772c4e4de8c696fc619ec97930b5e89098db9bee22c1136e002438b" [[package]] name = "wasmtime-types" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" +checksum = "4a95ea5572f8c3ffe777af21aa00a92097ded291a342fecad9f2c6a972ecea99" dependencies = [ "anyhow", "cranelift-entity", @@ -13214,9 +13392,9 @@ dependencies = [ [[package]] name = "wasmtime-versioned-export-macros" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" +checksum = "ac3621bfccd4e4336ae141d62b96e96316c0f23c47d64e9700594ebe3c4d9a10" dependencies = [ "proc-macro2", "quote", @@ -13232,7 +13410,7 @@ dependencies = [ "anyhow", "async-trait", "bitflags 2.6.0", - "bytes 1.7.1", + "bytes 1.7.2", "cap-fs-ext", "cap-net-ext", "cap-rand", @@ -13256,9 +13434,9 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a25199625effa4c13dd790d64bd56884b014c69829431bfe43991c740bd5bc1" +checksum = "d1d3e99f6bba37864487c9356398667699935b9cfa3655ed2b153b9428b3dd21" dependencies = [ "anyhow", "cranelift-codegen", @@ -13273,9 +13451,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" +checksum = "ee0f4524da226d2cb503d794c8928de6bc24878758cebd4e383c946e9fdb8b3a" dependencies = [ "anyhow", "heck 0.4.1", @@ -13553,9 +13731,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073efe897d9ead7fc609874f94580afc831114af5149b6a90ee0a3a39b497fe0" +checksum = "c139fb9298d9651b6869afd544e567ca2448cd5f5ddcb24e4bb86a1ee187c8b3" dependencies = [ "anyhow", "cranelift-codegen", @@ -13568,15 +13746,6 @@ dependencies = [ "wasmtime-environ", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.54.0" @@ -13651,6 +13820,17 @@ dependencies = [ "syn 2.0.76", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -14397,7 +14577,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.157.5" +version = "0.158.1" dependencies = [ "activity_indicator", "anyhow", @@ -14442,7 +14622,6 @@ dependencies = [ "image_viewer", "inline_completion_button", "install_cli", - "isahc_http_client", "journal", "language", "language_model", @@ -14470,6 +14649,7 @@ dependencies = [ "release_channel", "remote", "repl", + "reqwest_client", "rope", "search", "serde", @@ -14505,6 +14685,7 @@ dependencies = [ "winresource", "workspace", "zed_actions", + "zstd", ] [[package]] @@ -14517,7 +14698,7 @@ dependencies = [ [[package]] name = "zed_astro" -version = "0.1.0" +version = "0.1.1" dependencies = [ "serde", "zed_extension_api 0.1.0", @@ -14553,7 +14734,7 @@ dependencies = [ [[package]] name = "zed_elixir" -version = "0.0.9" +version = "0.1.0" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14599,14 +14780,6 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "zed_gleam" -version = "0.2.0" -dependencies = [ - "html_to_markdown 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zed_extension_api 0.1.0", -] - [[package]] name = "zed_glsl" version = "0.1.0" @@ -14623,7 +14796,7 @@ dependencies = [ [[package]] name = "zed_html" -version = "0.1.2" +version = "0.1.3" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14670,13 +14843,6 @@ dependencies = [ "zed_extension_api 0.1.0", ] -[[package]] -name = "zed_ruby" -version = "0.2.0" -dependencies = [ - "zed_extension_api 0.1.0", -] - [[package]] name = "zed_ruff" version = "0.1.0" @@ -14737,7 +14903,7 @@ dependencies = [ [[package]] name = "zed_zig" -version = "0.3.0" +version = "0.3.1" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14799,7 +14965,7 @@ dependencies = [ "async-std", "async-trait", "asynchronous-codec", - "bytes 1.7.1", + "bytes 1.7.2", "crossbeam-queue", "dashmap 5.5.3", "futures-channel", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index d0845a4a702b..3e0add61f3a5 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -86,13 +86,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.157.5"; + version = "0.158.1"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-xtSdlzj1AxhJN4aXLJ+Oy51LX4QduLwcuCfK42kthvE="; + hash = "sha256-X5FlNjAYG5W+RTdmyZHF1KYHxdwJGwk/qpOgj0JVD/c="; fetchSubmodules = true; }; @@ -107,11 +107,13 @@ rustPlatform.buildRustPackage rec { outputHashes = { "alacritty_terminal-0.24.1-dev" = "sha256-b4oSDhsAAYjpYGfFgA1Q1642JoJQ9k5RTsPgFUpAFmc="; "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; + "async-stripe-0.40.0" = "sha256-kVdYCmlM8DilSrcOGxI1tvSiUjSrXdnmKqBA9WUJgMw="; "blade-graphics-0.5.0" = "sha256-j/JI34ZPD7RAHNHu3krgDLnIq4QmmZaZaU1FwD7f2FM="; "cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM="; "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo="; "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js="; "nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo="; + "reqwest-0.12.8" = "sha256-mjO6SPYOMiw1H0ZEbd4BlPivPtaLVNftpsCu+M2i3Qw="; "tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0="; "tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE="; "tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw="; diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index 728ec4ee3c37..3252cce49d60 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -115,7 +115,7 @@ in stdenv.mkDerivation { buildFlags = [ "all" "selftest" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck ./zerotier-selftest diff --git a/pkgs/by-name/zs/zsync2/package.nix b/pkgs/by-name/zs/zsync2/package.nix new file mode 100644 index 000000000000..70a204eafab6 --- /dev/null +++ b/pkgs/by-name/zs/zsync2/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + libgcrypt, + libcpr, + libargs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zsync2"; + version = "2.0.0-alpha-1-20230304"; + + src = fetchFromGitHub { + owner = "AppImageCommunity"; + repo = "zsync2"; + rev = finalAttrs.version; + hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0="; + }; + + patches = [ + # Add missing cstdint includes + (fetchpatch { + url = "https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch"; + hash = "sha256-iLXxD6v+pSwFKmwAEyzbYUJ3DmtpvV/DYr8kcD+t5Cg="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'VERSION "2.0.0-alpha-1"' 'VERSION "${finalAttrs.version}"' \ + --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \ + --replace-fail '' '' \ + --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libgcrypt + libcpr + libargs + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_CPR" true) + (lib.cmakeBool "USE_SYSTEM_ARGS" true) + ]; + + meta = { + description = "Rewrite of the advanced file download/sync tool zsync"; + homepage = "https://github.com/AppImageCommunity/zsync2"; + license = lib.licenses.artistic2; + mainProgram = "zsync2"; + maintainers = with lib.maintainers; [ aleksana ]; + # macro only supports linux as of now + # src/zsclient.cpp#L460 + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index b4b0eb5f17ef..487599099be6 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "31.7.1"; + version = "31.9.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index ad740d88b3f9..d0cfe77b39f2 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0xpzsmvcvcf6c57bllg1yxylrvlm31gjpn9ilr7qz8bl7jz3z9rm"; - IosevkaAile = "0ar4wmsjdqh9a52k4vn9krpz7ii3bddnprqjyvpi9f1ybpxj74q1"; - IosevkaCurly = "1q9wqrhyk3636gy2yrkdc9l8wqiza3n5d6slx9h7529x8c6r64gb"; - IosevkaCurlySlab = "03an8nyg1xkv9l1fndk7agwkbg3s1kvwj342h3zj1klwi9bjz28b"; - IosevkaEtoile = "0qi8v8vzqifyxzzwqdx5kyvx11f1x8vgrk9104cb75xmslfa1wrg"; - IosevkaSlab = "0kmz8qywds7jr3wiy02p2c3r2y1bs0ibj7w6wa0kkkm82kk5v4b1"; - IosevkaSS01 = "091i0x9l589iq4f4mnkw26417vck6vhwnf2d68slv7xsss4jqpyw"; - IosevkaSS02 = "0dlsnglcbqpnpycqxq2aqgn80q6lrj50vrmgr71n051ix5mx5czl"; - IosevkaSS03 = "1y1l0rhbn55dd2scaffvk2fa6gap8rh4wb2lvi5a93z278ajcc7q"; - IosevkaSS04 = "01wgjwk77nb7f55zkdb6k897cv5rkx2q3va4r9rhj3z6aragp59c"; - IosevkaSS05 = "1w9wbwwzqf9812kd4q0g3z93f4qy6jn418m79d8s9bh132nm9jl4"; - IosevkaSS06 = "0s1cl8i7nv7yxynspix5mkl0db1vrlik5yiqs47ih8a82rm6zgmj"; - IosevkaSS07 = "0rssrgkfzr2pnycnjx2ny88sgcw4haqh5mmbyjnqm412602v57l1"; - IosevkaSS08 = "11yhnwymkr8m4si9ph2knk44rk7r87sjab0g2w8lhiamlcrps49a"; - IosevkaSS09 = "1mfv68s88zxvjcg90ha7cdhwhhlqv77b4iz7z991gmd34dd2n22l"; - IosevkaSS10 = "14j5mn7ry45f6vyzrq6v1qcssdz7s99d2hmpn3hh4gyn18hzadix"; - IosevkaSS11 = "0q3ksgh8y9mldr85k6l9q3p86yr13mcdvbwrrr2jy17kqjfms6yz"; - IosevkaSS12 = "1lh1vfv4q1ghdnxnk45hdqpp3pp7wr6pcv2b8k2rpjpv0w8wkz7b"; - IosevkaSS13 = "1vpkv053skbib9jgp75002gsisc2fpakwilh97sxnfyz47vqf6vk"; - IosevkaSS14 = "1q73a2wkdzd51s2bpjysh6k5scsqj089vphj68i1r3xzig5zg73d"; - IosevkaSS15 = "08qj500y20l4jzjd8qbdsifavi7hw1l136d2iqal2m18hy7kbvf3"; - IosevkaSS16 = "1ifmk9j4az7g3rlxdswxc2cz1hbn2nxmrh3ysi9gsjzppfayi4wn"; - IosevkaSS17 = "02abk8imd7kz1m4mq7c1sv13pm6d98l53qrh0291f3z5gpq6mdmw"; - IosevkaSS18 = "0ia83ijbq9bishj6gwij7sszp75bqwz1h30bxkavlxk5gfb770q1"; - SGr-Iosevka = "1n6v930a42wbx6bb1cyh6wvy2m885w60hlan9kgps682f8108h57"; - SGr-IosevkaCurly = "19r0swn7wz0h5m2f4vf2sk1lrdvrnv4nlr0hikb3mh6fylglwffv"; - SGr-IosevkaCurlySlab = "1xygrs9x8j9lm2n400i8m0i5vgwiq75vq4hm3712hkx2dx1kjycf"; - SGr-IosevkaFixed = "0nl380k30l4gn327kp51vwzlqh9j39w6frhmrxbmdcblnz1sc5md"; - SGr-IosevkaFixedCurly = "05aagifx30xzb9rmylx8k4jvpr8wgzi2dmc2ili40yk06jw97py1"; - SGr-IosevkaFixedCurlySlab = "1blad2s6kzz64c5fri50fqwivy8qxzkfxjg73wqyjzhmwbf5am1d"; - SGr-IosevkaFixedSlab = "1f0zqrd193w0lpzbl24ldr7wbbag3v6ahkch5jzad2f931fi62vl"; - SGr-IosevkaFixedSS01 = "1nyvwab562a0c5f1gjqw4wwq3lkizz1zi0bpg3dbfk72kzwlx31n"; - SGr-IosevkaFixedSS02 = "1k2lkf5cxxbp2rimv97c6bqq2fqkz4iwhvqh2bp3jw4jsxrqragc"; - SGr-IosevkaFixedSS03 = "0c679d897k6jdwwsrmj57v6q08ns6brrn6pp53m1fs4v8vsy7gq8"; - SGr-IosevkaFixedSS04 = "1zcv64yivzflr106vi9a0nzxl93d68d2pp07dlfc7acd86ps90j1"; - SGr-IosevkaFixedSS05 = "1g45312ly0zr1hsgdv1nhj2slrign6lddnxxalnbpi065qcgxzdb"; - SGr-IosevkaFixedSS06 = "0ahpvw9z573xd437m0vdyh7bh68z7frisjrm4r02a2nd0bc8rfva"; - SGr-IosevkaFixedSS07 = "06a5gfzf2a8ci8qvxfr8m0pj4avg5fggfdfs51lwn5n1rjqv3jms"; - SGr-IosevkaFixedSS08 = "00x0rz0j6l5lnb1bnly3dswazgxpdx5gd3ggihxcwvkjfarbs12y"; - SGr-IosevkaFixedSS09 = "089qlqa9hrfq1dwdnj29kr3r60n95gsnqqcgx1y87nw8xxaj1l8c"; - SGr-IosevkaFixedSS10 = "1g1xic30x6sb5jkg9ws1ymk1530402m60v6bsl9l164hj5wbfsjh"; - SGr-IosevkaFixedSS11 = "0rpbr95k2xzg7gilljhrx2jhwxaqg6v7hfxj3mrjid5jjphrw43v"; - SGr-IosevkaFixedSS12 = "1iz5apwf4700r63gicqcbic77f0dp1fhnqaxigrmhsyxwff8b31m"; - SGr-IosevkaFixedSS13 = "1igwj2ikfamrdd6nbmdy72sdrk7k2v1j32yny9bl5wx13dw7575b"; - SGr-IosevkaFixedSS14 = "00032jy2vls5f0frpnpbiiw8i2v1qj84hy1wcksgy4j357vw4lpf"; - SGr-IosevkaFixedSS15 = "1kpgkvq022gb3j33kr9b97ays0wvc5wl23n9cvq9ij8j3wbs4z3k"; - SGr-IosevkaFixedSS16 = "0bnc7y6ma9mi5xwy7csn9h75ahv3g8ggkfhr02qn34qm2dbmif1n"; - SGr-IosevkaFixedSS17 = "1d62jfwrpvh735jlvk812ymmly2qhkpn38s0gh48m28whgwvrhcw"; - SGr-IosevkaFixedSS18 = "18954hkad2b8pbp9f33f7ml4rzgkxl2hnjdc69zhav76lxd6369x"; - SGr-IosevkaSlab = "0lvx0ghvy17b6jzpc88kj0p1symf4vqahlc6wa2w4jsb2csc9d2l"; - SGr-IosevkaSS01 = "1b54d5g50k8hl3hnhmng4amayh5wmbvvkzq48mld6zwlfr1fadkd"; - SGr-IosevkaSS02 = "0bg9y4fr812ax34kmdz727ib67dghpbsim7a57isc897x0igcbnj"; - SGr-IosevkaSS03 = "01rsg0f8nxzl7i0w0sfp0sdrd1ab7p4qdadan486jaarxbjd6kx7"; - SGr-IosevkaSS04 = "1l36xjs0pm83i1azx0s2y541x6b83b1dw9ghf5ajgll29sz0gnlx"; - SGr-IosevkaSS05 = "0fj2jd65yhbxs9f2sadzpdm05d5api9ffqjx8a9hdc291ykl3sw6"; - SGr-IosevkaSS06 = "105g5p9rvr8cfiqf4wbjsly8616jm49bx088ddgj4jyli1msjh8k"; - SGr-IosevkaSS07 = "0lci5wa9q8bk57d0c99r86nhxh17qw4s0mh8yismnb0hqcknhfly"; - SGr-IosevkaSS08 = "1v56yda5w45mi9hmbdswqa4dmscf728a2bj0lf3ai9zcprfnc8d3"; - SGr-IosevkaSS09 = "0bgn9q6r1a3799nawhgzws9rm7mzibiz4ya2x4qkmawzzi1rdgjs"; - SGr-IosevkaSS10 = "19nqp295cdq7k1zlh8nd42wa3m11ql7112v746vvwq5bpr79dn8c"; - SGr-IosevkaSS11 = "0jr9j8c51fh3dp8mqiimr4lhnvznpn2q3swz2zyc8jlmbyga02ad"; - SGr-IosevkaSS12 = "176mby5agqa7fll9wq16dws98nn7igfx72fni1f509hq5k7xygsp"; - SGr-IosevkaSS13 = "0a53868nnwgql2sf909ybpdibjii8w89bp0kc8xymx7v9i2m4iyf"; - SGr-IosevkaSS14 = "11m4v27sf6qif6069nm71dfnksp7bldkvlx9bbvyn0y6lg9n1pfl"; - SGr-IosevkaSS15 = "00wr61nlf091gkwh5kdx8wp75y0vi2dlra91m89b4w6592vwffk4"; - SGr-IosevkaSS16 = "0b1fqrcx65ajanc433gyscw15ra230z8gs5kh0ahhkwqwz1al0lq"; - SGr-IosevkaSS17 = "1xsvga76x8p87ws386gmz28nghw3ybr1rck722a5wzzlz5z51p3m"; - SGr-IosevkaSS18 = "0w97ayi3jsb3313bw9dr9xb1l5lx6d26rc5yw0y9c9ph180f9afy"; - SGr-IosevkaTerm = "0b5y4gg149271gmf255hr8lp1n2qxafp5k1gi7h7rpnnndaimj1g"; - SGr-IosevkaTermCurly = "1izpf2sb0zv2kfqm1zb1ambicydqbis202n36rxn3b3sfa41hnwy"; - SGr-IosevkaTermCurlySlab = "03dbzgp0g0767aym5rshbjvzbhff8gpg90zl9sqrrfgmwav9yqd6"; - SGr-IosevkaTermSlab = "1amaimpr84q36gf2ma31d5ss57g84d8rw4bzg7058kd801yc1y53"; - SGr-IosevkaTermSS01 = "1pj4bb7q9bjwnss2353ldw599f8sns28vc8h8n33sq9xqrna9fbd"; - SGr-IosevkaTermSS02 = "1rgwyhzzpllprs2rmkrsc8xknsc4gzi3h0cv96qnx9jvd9ixyq67"; - SGr-IosevkaTermSS03 = "1c682qaj6bzyrwq4yc9bxn8y6yza9hn0c3hpj5g62akwk50dvkg9"; - SGr-IosevkaTermSS04 = "02rgpbb2wn3aibkkpfi2sxy751bwmf7azkv44xdalhyb6hz7vfgv"; - SGr-IosevkaTermSS05 = "187kwn9g81rpq71w58hdi27ngl1zby550xx85a2dz00w7j1l1qy3"; - SGr-IosevkaTermSS06 = "13k91ha10yymh5wcnf45sh1d51rgnlrzdg9bdh4r86122mq2pvl9"; - SGr-IosevkaTermSS07 = "16mq7mbcrqvpmwl6zgbs8r4w5b1r0m01i6iiwv20x74ay9pkglmv"; - SGr-IosevkaTermSS08 = "0npiqvw4ai9mq9ix0hfrq86h3y828g284nw2q4dgqpcpvhm8kxq5"; - SGr-IosevkaTermSS09 = "105p6x8chm9lsapb6ccpvhbrhaackdscjqi5j04hadkf4kxp7cn4"; - SGr-IosevkaTermSS10 = "023bgny097p8n58npf7f3y7shxgyfgqh5yy67lc64gwi3bw8lwb6"; - SGr-IosevkaTermSS11 = "1lkkkcqpgcfs3j3vdr3nryaxhycgz67d58zd54mpkxj3hicag1i9"; - SGr-IosevkaTermSS12 = "18d53273x83sq7nm6mi810y74i57nlz46vxxybdjbfp3i74rl14q"; - SGr-IosevkaTermSS13 = "1vi5i12l7pp2ishk8wdn2rpbxhmmvjqla6zcn5grq9i3ki92hbaf"; - SGr-IosevkaTermSS14 = "0p5pzcmhg4wbmr8kp2ydhrprnw7ll9wvvsni05347s3vg7scd7al"; - SGr-IosevkaTermSS15 = "11grinpbmd0qpkqs31qg20bdd1y35570ja8ifx8pfh0j91x97q1f"; - SGr-IosevkaTermSS16 = "1mbqzfaxqi1l406wjjnz34nhlsgxj4jsayybdwv12nv7v8fbyalj"; - SGr-IosevkaTermSS17 = "138jbkicfrqgqg04am8fwvjr5zmjxx22ik1ss4iivgl0grr07ysf"; - SGr-IosevkaTermSS18 = "0glfd94lv7pl52apfxks0ic6w66347c4hxm57phylfmmvd163zd0"; + Iosevka = "1nma01k7v4dhq0w84l5qdxakl6ajhf76g54lm5xb0yggarl9fn3y"; + IosevkaAile = "0lqcwmal97ddfzvi6zdrcxygmi0rszmrmlqpc49fn01yl0gkb4p1"; + IosevkaCurly = "0xncws9cgjjhz120nvkxikc7kqj1vqqwghb1sx7kcfjqh5rkngna"; + IosevkaCurlySlab = "1srfhrr44wp208xw0z4z16jsmh4saaszglgpsxyyhgkdmdzpn0w4"; + IosevkaEtoile = "1aw89ig62wfm80655ib07xwpn17skvqwd4rpwq7xk6ryz6jnlgrr"; + IosevkaSlab = "1dj2blr87jn3cxb2y2mybk359bvgj7kni34adha722mp039z8di8"; + IosevkaSS01 = "18y79gghmkhi26kzv9r28z0wgcc9ybca7jdqwlc5wb0vky5w9wq4"; + IosevkaSS02 = "1lxggf53dmxcsj333ibp3lm6cpzlwldf4irkm5kimxw0z8gph8xq"; + IosevkaSS03 = "0ywfxjdhssdlddgpr48crff3pkpp5rm0kshmkib2gmy5xgyhf7dr"; + IosevkaSS04 = "13970rb1kasn65rjw318zga6q677wj9bx0p7bp6cy31dmg0v6mp7"; + IosevkaSS05 = "0ckfw0kajrmw6nxyjivdkizxbf9fxjdlwczs2lxn2vjbapy4c7kf"; + IosevkaSS06 = "1rx065pwwaf99riz4b8104y1kgsn69bqf03832wicr5809knvsnj"; + IosevkaSS07 = "074nyqi46rls2nxfczq4m48xkx777dnw96zrhy6m01lly07xhpny"; + IosevkaSS08 = "04vapfj8jx6c9799z4fqcabm7y7xbcbnm8x1bamimchbk23xwy1d"; + IosevkaSS09 = "1n56r4c1glwssv4jwgls88x6wnxv9j6k8myzf2fwy4cci5s2d5as"; + IosevkaSS10 = "0ndambz7fz38s7x99lxqjjgkykwrml7wpf2svb9vw2wnyiiwzn69"; + IosevkaSS11 = "1fm5aihz9dvvp5viir1b9wb80zhaxfl3w9w5siniprq46y31cmys"; + IosevkaSS12 = "1fjd73xxdch5rfw2k2330np994pcv2xrzf1l12b585maj3l926p2"; + IosevkaSS13 = "03kyf09gpn5rp0l71gh1680nlh0cc7jlak0kzplv2bfg1wwkh5x8"; + IosevkaSS14 = "0jhyjcq1x28fdbnqij71z8cd3ww7pj0bih4wbs7jmj87xvxn94zm"; + IosevkaSS15 = "16im03mgs6c8nmaxs1p986mzsk78fhxyqcla75hajbj6i5j6j5iz"; + IosevkaSS16 = "1jfcyb0dkwb9dxby4kap1vc5kfzap2fxgjgan5437pxrjlkmmnkd"; + IosevkaSS17 = "11hdwspxlh9wa3jcph9zgcgm8r5w7jrazv1bny3n7d9ikw7i7jh6"; + IosevkaSS18 = "0g6qq8q5hnsv55kkdv3hsdvs6n5plpkyawlhdrm76qlrg7iw1ii3"; + SGr-Iosevka = "1f628x5pchva8c10b5w8x5cl89p28p3ir6c0m5l524kq6b4qxspf"; + SGr-IosevkaCurly = "09hv8pbikmmx17gmb32mbjpak9818qqvknln88ssdra2b7sh88a9"; + SGr-IosevkaCurlySlab = "11kxz7lzm38lg725ws7yh87zh5jnwqw4938l8bxw1pjxj4jyhbi7"; + SGr-IosevkaFixed = "08kd556v0wbsdcz1i83bzv29wsklw0h1jiridh1kjdwn73xdnaj2"; + SGr-IosevkaFixedCurly = "1r6iyxmnr84p44f1jbj8x2w8ki9fxflmv15zvhv3ikbfar9ypp86"; + SGr-IosevkaFixedCurlySlab = "016qfwdv5173c7b11h9df8dz9xywfzcds2sd869bsp5i5g6im76j"; + SGr-IosevkaFixedSlab = "1zwg86v81wwvrgvc4hy96s6rj5i4p67i4waj5c120in7hghlc6rm"; + SGr-IosevkaFixedSS01 = "0ihn36hfrsqbv3r365wy5z5wf5j464683vhdi5nk8vyq5b7x1hps"; + SGr-IosevkaFixedSS02 = "14z624mshjdgxm77h5c1xg44qnwjn9m6bx9ymzia7hxwpl3xsbf9"; + SGr-IosevkaFixedSS03 = "0nbvfqsfcsj26scd5ia2rvnj6qh8pg9wv8q9avidc5f6dsq4sy5z"; + SGr-IosevkaFixedSS04 = "073x2v0cghn3fp6ycfk16wn4vbqrgqwc4h2ky9gx3ndpf6fy5znh"; + SGr-IosevkaFixedSS05 = "0jnzf55jjx04zb33zasxyjshk4zbabnfcdb0pr5q400wj9qnnv6s"; + SGr-IosevkaFixedSS06 = "19gdzg4phs5cc0gj3zrhh9113infq8amwcizfq1mhsb7z1fqg48f"; + SGr-IosevkaFixedSS07 = "1rv2w9h5fwwdk6zq6ra9pmh4f7pdq87ydcwp11hhcjlk0iln1602"; + SGr-IosevkaFixedSS08 = "0lqm6c5b9y2crq694g00ryrq5j197yhlqvqk7ss494xv3vscrmsa"; + SGr-IosevkaFixedSS09 = "0v0w5vwgl3x84sqmw6wjam6inygchx1z9ax6km8hxlwjx4by9m32"; + SGr-IosevkaFixedSS10 = "0mfh0wr9ixgjp32i9hbhp0x8v3afwgplprivwl7qbgn18arr1ff8"; + SGr-IosevkaFixedSS11 = "03d4vwr9d4dw9dk9s0x3jsb9bahy69rz3lqq8zwyny1ipkdbynx6"; + SGr-IosevkaFixedSS12 = "0pvr9m1jdn2m0w1gx9rvyhphg1bd7s3jjibj3nbb8qmsx32rw347"; + SGr-IosevkaFixedSS13 = "1jvy36qqghjnv3grry6cpwhqsj0x0cdi2izqqin0pfa304r56pc6"; + SGr-IosevkaFixedSS14 = "1l0cb9my5xg5f13kyp3v9fs65wj66rx5asirqv339qbhw0hg5sp3"; + SGr-IosevkaFixedSS15 = "0b590zg0mrcv4rf51rcnah654rsicvw0j6v2dqgjvm7x62pkiks5"; + SGr-IosevkaFixedSS16 = "0ij7xv0d1d1s8g7qcchrhbv088zcvr2ircm8dqg7pkwwla31342y"; + SGr-IosevkaFixedSS17 = "1rnvxq37lvwf0y3fd7cq9qk78gh3vbw380a7a82r0qqypynid47m"; + SGr-IosevkaFixedSS18 = "0g24q74z7vrbl21ljmibf9ay4mz5m568fs6nagli4fd5q6nag6p3"; + SGr-IosevkaSlab = "0fzcs3xg36fd6kbq3gzrirc6qw9jakq4gkc480kxa8hvmcyqn30a"; + SGr-IosevkaSS01 = "1w9nmgqcwa8zhmwprbw9wsd9y0q0g8v1nrg54b8hcnhfqj0hqqxg"; + SGr-IosevkaSS02 = "1g30im488cql8nzkqmirpz0sa0w67s2qfjyiz5fcpsdim6dg90vx"; + SGr-IosevkaSS03 = "00yfkypnvgkpvsghwvn19nyjcirk8rpjhly9y1bkmvlz0x6ljhyq"; + SGr-IosevkaSS04 = "0wx2zcq2wrar4bxvv0asqhmh1yvaf0nknpk78bvdrawprylcwmam"; + SGr-IosevkaSS05 = "0p1xibl1aklyyxdfkhp8rb6c49b7832h8k89yqw17y1yw0n8pfl4"; + SGr-IosevkaSS06 = "05zry2qy3q7jkhpj233j2wpc66rr4dm02xly7wsn9vhalx178jgk"; + SGr-IosevkaSS07 = "0an7sp8dh4x8vnnvgvp49iskryh5z4npmn47vi3jxl6vpl70flx0"; + SGr-IosevkaSS08 = "198pywx83ciwfvhcgy7r7zw0hmm1xh4ccjq6h7spg8ca7x87sc0c"; + SGr-IosevkaSS09 = "1vpqzmkyjn1k0rlpq7q2yky3a3l0yczlsvvi8pvfhgpcxsrmvgsr"; + SGr-IosevkaSS10 = "0p75b9w9ljjcz16p4dv5phyhwdhxgb6kkpdpn1xpibbxifrcp400"; + SGr-IosevkaSS11 = "0hdwkn69g4h93l64b5dn6kmqlnrm8pnl5721k25vjac631yzjpig"; + SGr-IosevkaSS12 = "0rlr2wh9h650ax4ngf37ch3l90f641fxq81h31qbcxi1798sd5ds"; + SGr-IosevkaSS13 = "1qf69czsqd52580xwqpr4wvx88wi8csf1cxyjwv6h44gzfx5ka89"; + SGr-IosevkaSS14 = "1jyml7xkbsdi22q3c0l6527q1ii97qyfj3h2dwxcly2v0jx22l0n"; + SGr-IosevkaSS15 = "0yssy3vrmgfqachms20b6gl52lkk0drxrvwnyizc9lc96fx1x4a3"; + SGr-IosevkaSS16 = "1hll0l63d300047jwh7m81djqf7mgg0gdv1gw7dynl8rpp8iqwxw"; + SGr-IosevkaSS17 = "1rf3m48h396ql9m6i8c3gnxy0q7a9l8xk3xrwcnf2pidghgnwj5f"; + SGr-IosevkaSS18 = "15cp4y4221vggd3q6202z1r46fkdrn81j33bskwaq3vqn4ykrpvx"; + SGr-IosevkaTerm = "18kscgr1398zdzqdy7m693lw8gh9r3wrzw9gg62ksdbcbwn16im4"; + SGr-IosevkaTermCurly = "1v8y7km35hmkm8fx08szjwkxpykyd88nfvwi15jiajc4gbsl3hvy"; + SGr-IosevkaTermCurlySlab = "026bg6q5v8n4wfaw0mbrscylxqwfs5m727dvv734km110p5dvx1j"; + SGr-IosevkaTermSlab = "034chas42avxrkw2s5x08bwydarazk9h50blv3vraj66qzw2vngx"; + SGr-IosevkaTermSS01 = "17va6zc2wjn2nm7ixdv11mjmxcnkr5yca8af6prnfdkdmdaxp1zd"; + SGr-IosevkaTermSS02 = "1mvisnjn3gj2zs6g5n856mkixyhc6bspv9zcknb51am2s9n8mv5b"; + SGr-IosevkaTermSS03 = "00pigslzg8fwdg51qs8096w14b8dgycgsm3j4ab6xpp5hshvna5a"; + SGr-IosevkaTermSS04 = "01jjg7hjz0y8nc8cijlfc8zp1b49hby0ihwv1yk7skhs9gvr99rp"; + SGr-IosevkaTermSS05 = "07ykxm73445a7i8693zdsp5d1rjmccq7bysj90y73lky5f1w1bc4"; + SGr-IosevkaTermSS06 = "17rdmamd4p469kw7nwxcdaih8ps7n0jrlwkni4n4vfib28pcym9r"; + SGr-IosevkaTermSS07 = "0vgh7g9xyl52gb63hw09mszmkya7afvizhddni6mff7f5xdzy1mh"; + SGr-IosevkaTermSS08 = "0s524hhg64jfwbgifariasv4cd425alscspkc2d02d0gf4d4czbb"; + SGr-IosevkaTermSS09 = "15w06z0mkph0cpkw5xyzn53dpmc11p7c2nya35m72harwdvpawsv"; + SGr-IosevkaTermSS10 = "0b4z99b2mqa11avkiyamy9kzchp1x09lyhglc9d10qm94phi75iw"; + SGr-IosevkaTermSS11 = "1xnnmpx01i2diz9qvmfb0gc0injdqk9n41c0ci93lpvk3rxjvcs7"; + SGr-IosevkaTermSS12 = "1kbfbdjcnaxh3s6q5b3pwy8bknvz0av5s0h4hvq6qnrvvrdrdr4f"; + SGr-IosevkaTermSS13 = "1rnxy0zbl8pc4ph2zpjcc101vbb2ss2pvxx4h32gvkx5j0sk1cfl"; + SGr-IosevkaTermSS14 = "0k1v9jl52j37fq86p3gwpf31qa1a6alj18hi2bbv5ybzya7m8pp8"; + SGr-IosevkaTermSS15 = "1c6mw04h1zgjdnzlim553za899gc07gnhianw499dv3yi87p012q"; + SGr-IosevkaTermSS16 = "0aggw8hn5g3cvlxcdsyjcxq1ygrmrjq2xjsvwkmvdsfpfhsp1zsa"; + SGr-IosevkaTermSS17 = "191jy9j3bm7xnp7w9mq5kllf96vwhzvyq1nfcdd0ly773a3bjg4a"; + SGr-IosevkaTermSS18 = "10dbr3r4jxb9jq82hxhwqsxd8hrhjw626hv6i6g368g73x68sxk2"; } diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index eab325af54c5..36b7e6e2ac33 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -19,8 +19,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = ''Typeface designed to mimic the national park service - signs that are carved using a router bit''; + description = ''Typeface designed to mimic the national park service signs that are carved using a router bit''; homepage = "https://nationalparktypeface.com/"; license = licenses.ofl; maintainers = [ ]; diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index f99624f4a483..59ddfb5011e4 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -36,10 +36,11 @@ in stdenv.mkDerivation { meta = with lib; { description = "Monospace bitmap font aimed at programmers"; - longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at - programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn - font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and - Consolas. + longDescription = '' + Tamsyn is a monospace bitmap font, primarily aimed at + programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn + font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and + Consolas. ''; homepage = "http://www.fial.com/~scott/tamsyn-font/"; downloadPage = "http://www.fial.com/~scott/tamsyn-font/download"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 74bd1be5f24e..7c4e18d7bebb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-RelK4HIyTQ6kXi7/K8U33sKIrDrhA3IFVnnvX4x88UQ="; + sha256 = "sha256-zMvw96uRr9hrgXck+OhMiPku9qu8/zUtusiaJLUcuys="; }; patches = [ diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index b52d3fa6a31c..c3ff5334cadb 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { # For libuv on darwin lib.optionalString stdenv.hostPlatform.isDarwin '' export LIBTOOLIZE=libtoolize - '' + - # Help libgc's configure. - '' export CXXCPP="$CXX -E" + '' + '' + # Help libgc's configure. + export CXXCPP="$CXX -E" ''; patchPhase = '' diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index c9fc962e30b4..9b110b0a8b04 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -93,13 +93,13 @@ stdenv.mkDerivation { meta = with lib; { description = "MIT/GNU Scheme, a native code Scheme compiler"; - longDescription = - '' MIT/GNU Scheme is an implementation of the Scheme programming - language, providing an interpreter, compiler, source-code debugger, - integrated Emacs-like editor, and a large runtime library. MIT/GNU - Scheme is best suited to programming large applications with a rapid - development cycle. - ''; + longDescription = '' + MIT/GNU Scheme is an implementation of the Scheme programming + language, providing an interpreter, compiler, source-code debugger, + integrated Emacs-like editor, and a large runtime library. MIT/GNU + Scheme is best suited to programming large applications with a rapid + development cycle. + ''; homepage = "https://www.gnu.org/software/mit-scheme/"; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index ae2d11feb765..d5e297ae26ef 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -39,14 +39,16 @@ stdenv.mkDerivation rec { ]; # tinycc configure flags copied from the tinycc derivation. - postConfigure = ''( - cd contrib/tinycc - ./configure --cc=cc \ - --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ - --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ - --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ - --libpaths=${lib.getLib stdenv.cc.libc}/lib - )''; + postConfigure = '' + ( + cd contrib/tinycc; + ./configure --cc=cc \ + --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ + --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ + --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ + --libpaths=${lib.getLib stdenv.cc.libc}/lib + ) + ''; postInstall = '' wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index ddd62872d451..8ad74c00ec87 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "0-unstable-2024-05-14"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "d3733a7fca1d02ad91b58b377ecb38e1293889db"; - hash = "sha256-gDrmm7hd07lv0KhkP7Bys5qCuCCH+t/XvlftCYlCyI8="; + rev = "f0a6465832643ba08b7f94fb814c552804fb395b"; + hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo="; }; postPatch = '' diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index ef238ebaf306..3ac761b42319 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -118,10 +118,12 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" - LIBS="-lrt" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" + LIBS="-lrt" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" @@ -134,9 +136,11 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.stack.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.stack" @@ -151,9 +155,11 @@ let platformDir = "linux64x64"; vmName = "newspeak.cog.spur"; scriptName = "newspeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog.newspeak" @@ -166,9 +172,11 @@ let platformDir = "linux64x64"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index ca23261a9865..1b3b24b0abea 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -92,14 +92,15 @@ stdenv.mkDerivation (rec { # make: *** [Makefile:222: test-full-programs-release] Killed: 9 doCheck = !stdenv.hostPlatform.isDarwin; - installPhase = "make config=release prefix=$out " - + lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) - + '' install + installPhase = '' + make config=release prefix=$out ${ + lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) + } install wrapProgram $out/bin/ponyc \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" \ - --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" - ''; + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" \ + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" + ''; # Stripping breaks linking for ponyc dontStrip = true; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 872dcae2e132..3b37e19fa2fb 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -20,16 +20,16 @@ stdenv.mkDerivation rec { homepage = "https://rgbds.gbdev.io/"; description = "Free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; - longDescription = - ''RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of: + longDescription = '' + RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of: - - rgbasm (assembler) - - rgblink (linker) - - rgbfix (checksum/header fixer) - - rgbgfx (PNG‐to‐Game Boy graphics converter) + - rgbasm (assembler) + - rgblink (linker) + - rgbfix (checksum/header fixer) + - rgbgfx (PNG‐to‐Game Boy graphics converter) - This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. - ''; + This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. + ''; maintainers = with maintainers; [ matthewbauer NieDzejkob ]; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 1e2851149ef6..9336adb1cd76 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -71,9 +71,9 @@ let extraLibraries' = if extraLibraries == [] then [] else throw "option 'extraLibraries' removed - use 'with*' options (e.g., 'withJava'), or overrideAttrs to inject extra build dependencies"; - packInstall = swiplPath: pack: - ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." - ''; + packInstall = swiplPath: pack: '' + ${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." + ''; withGui' = withGui && !stdenv.hostPlatform.isDarwin; optionalDependencies = [] ++ (lib.optional withDb db) diff --git a/pkgs/development/libraries/bencodetools/default.nix b/pkgs/development/libraries/bencodetools/default.nix index 7a826efa7ef7..b6a9ab68dda0 100644 --- a/pkgs/development/libraries/bencodetools/default.nix +++ b/pkgs/development/libraries/bencodetools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ]; # installCheck instead of check due to -install_name'd library on Darwin - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckTarget = "check"; meta = with lib; { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index b0ccaeeb45fb..28a08cb0d2f5 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -840,7 +840,7 @@ stdenv.mkDerivation (finalAttrs: { ]; }; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let diff --git a/pkgs/development/libraries/flatbuffers/23.nix b/pkgs/development/libraries/flatbuffers/23.nix index 5263694b0562..4e30c3dd37b6 100644 --- a/pkgs/development/libraries/flatbuffers/23.nix +++ b/pkgs/development/libraries/flatbuffers/23.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 00bb9cc8d187..58ea13a50b92 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 6bddc8c6b5e5..02d983b9f495 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -98,6 +98,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; }) + # disable test failing with proj 9.5 + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/bb9e5c0ec3e45b0f3e60c4d284e4082550448480.patch"; + hash = "sha256-TpjlxTH/51aRZkogpJuiNlfz3RLCe80wQVD4i+5m+Pw="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 9fa8765f054e..1f7974476b02 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU Linear Programming Kit"; - longDescription = - '' The GNU Linear Programming Kit is intended for solving large + longDescription = '' + The GNU Linear Programming Kit is intended for solving large scale linear programming problems by means of the revised simplex method. It is a set of routines written in the ANSI C programming language and organized in the form of a library. diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 8b9089273032..735a1a58fad6 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: { description = "GNU SASL, Simple Authentication and Security Layer library"; mainProgram = "gsasl"; - longDescription = - '' GNU SASL is a library that implements the IETF Simple - Authentication and Security Layer (SASL) framework and - some SASL mechanisms. SASL is used in network servers - (e.g. IMAP, SMTP, etc.) to authenticate peers. - ''; + longDescription = '' + GNU SASL is a library that implements the IETF Simple + Authentication and Security Layer (SASL) framework and + some SASL mechanisms. SASL is used in network servers + (e.g. IMAP, SMTP, etc.) to authenticate peers. + ''; homepage = "https://www.gnu.org/software/gsasl/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 19bcb4ad99c3..d3a79cf0e9d4 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { description = "Image viewer widget for GTK"; - longDescription = - '' GtkImageView is a simple image viewer widget for GTK. Similar to - the image viewer panes in gThumb or Eye of Gnome. It makes writing - image viewing and editing applications easy. Among its features - are: mouse and keyboard zooming; scrolling and dragging; adjustable - interpolation; GIF animation support. - ''; + longDescription = '' + GtkImageView is a simple image viewer widget for GTK. Similar to + the image viewer panes in gThumb or Eye of Gnome. It makes writing + image viewing and editing applications easy. Among its features + are: mouse and keyboard zooming; scrolling and dragging; adjustable + interpolation; GIF animation support. + ''; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 6fb5f8a14c67..7d51386c589c 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of JavaScript written in Java"; - longDescription = - '' Rhino is an open-source implementation of JavaScript written - entirely in Java. It is typically embedded into Java applications - to provide scripting to end users. - ''; + longDescription = '' + Rhino is an open-source implementation of JavaScript written + entirely in Java. It is typically embedded into Java applications + to provide scripting to end users. + ''; homepage = "http://www.mozilla.org/rhino/"; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index aa9f50917be1..996c92ef20fc 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -36,20 +36,20 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools & library for data backup and distributed storage"; - longDescription = - '' Libchop is a set of utilities and library for data backup and - distributed storage. Its main application is chop-backup, an - encrypted backup program that supports data integrity checks, - versioning at little cost, distribution among several sites, - selective sharing of stored data, adaptive compression, and more. - The library itself, which chop-backup builds upon, implements - storage techniques such as content-based addressing, content hash - keys, Merkle trees, similarity detection, and lossless compression. - It makes it easy to combine them in different ways. The - ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the - manual, provide direct access to these facilities from the command - line. It is written in C and has Guile (Scheme) bindings. - ''; + longDescription = '' + Libchop is a set of utilities and library for data backup and + distributed storage. Its main application is chop-backup, an + encrypted backup program that supports data integrity checks, + versioning at little cost, distribution among several sites, + selective sharing of stored data, adaptive compression, and more. + The library itself, which chop-backup builds upon, implements + storage techniques such as content-based addressing, content hash + keys, Merkle trees, similarity detection, and lossless compression. + It makes it easy to combine them in different ways. The + ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the + manual, provide direct access to these facilities from the command + line. It is written in C and has Guile (Scheme) bindings. + ''; homepage = "https://www.nongnu.org/libchop/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index e154eebc48c1..ac64cbc1801c 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = - '' echo "patching installation directory in \`extractor.c'..." - sed -i "src/main/extractor.c" \ - -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" - ''; + preConfigure = '' + echo "patching installation directory in \`extractor.c'..." + sed -i "src/main/extractor.c" \ + -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" + ''; nativeBuildInputs = [ pkg-config ]; @@ -71,26 +71,26 @@ stdenv.mkDerivation rec { description = "Simple library for keyword extraction"; mainProgram = "extract"; - longDescription = - '' GNU libextractor is a library used to extract meta-data from files - of arbitrary type. It is designed to use helper-libraries to perform - the actual extraction, and to be trivially extendable by linking - against external extractors for additional file types. + longDescription = '' + GNU libextractor is a library used to extract meta-data from files + of arbitrary type. It is designed to use helper-libraries to perform + the actual extraction, and to be trivially extendable by linking + against external extractors for additional file types. - The goal is to provide developers of file-sharing networks or - WWW-indexing bots with a universal library to obtain simple keywords - to match against queries. libextractor contains a shell-command - extract that, similar to the well-known file command, can extract - meta-data from a file an print the results to stdout. + The goal is to provide developers of file-sharing networks or + WWW-indexing bots with a universal library to obtain simple keywords + to match against queries. libextractor contains a shell-command + extract that, similar to the well-known file command, can extract + meta-data from a file an print the results to stdout. - Currently, libextractor supports the following formats: HTML, PDF, - PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI, - MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64 - music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ), - ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse - Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF. Also, various - additional MIME types are detected. - ''; + Currently, libextractor supports the following formats: HTML, PDF, + PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI, + MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64 + music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ), + ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse + Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF. Also, various + additional MIME types are detected. + ''; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index e8ceb261a4fe..2105f2cc0f96 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://xiph.org/fishsound/"; description = "Simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; - longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. + longDescription = '' + libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. -libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. + libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. -FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution.''; + FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution. + ''; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index e76b528395ef..e27e8e1c387c 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmodbus"; - version = "3.1.10"; + version = "3.1.11"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; rev = "v${version}"; - hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k="; + hash = "sha256-d/diR9yeV0WY0C6wqxYZfOjEKFeWTvN73MxcWtXPOJc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index cdc4b4f077ad..643c671f7792 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -50,12 +50,13 @@ stdenv.mkDerivation rec { homepage = "http://www.clutter-project.org/"; description = "Clutter-based toolkit"; mainProgram = "mx-create-image-cache"; - longDescription = - ''Mx is a widget toolkit using Clutter that provides a set of standard - interface elements, including buttons, progress bars, scroll bars and - others. It also implements some standard managers. One other interesting - feature is the possibility setting style properties from a CSS format - file.''; + longDescription = '' + Mx is a widget toolkit using Clutter that provides a set of standard + interface elements, including buttons, progress bars, scroll bars and + others. It also implements some standard managers. One other interesting + feature is the possibility setting style properties from a CSS format + file. + ''; license = licenses.lgpl21; maintainers = [ ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 13b117b5e012..2231adbf80cc 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; license = lib.licenses.gpl2; - longDescription = - '' libstroke, last updated in 2001, still successfully provides a basic - gesture recognition engine based around a 3x3 grid. It's simple and - easy to work with, and notably used by FVWM. - ''; + longDescription = '' + libstroke, last updated in 2001, still successfully provides a basic + gesture recognition engine based around a 3x3 grid. It's simple and + easy to work with, and notably used by FVWM. + ''; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index b15997cb436b..ffc6665af42a 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { fi ''; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeCheckInputs = [ gtest ]; enableParallelChecking = false; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 339db2bb0879..d690cc45b2f9 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DJSON_MultipleHeaders=ON" ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}"; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # skip tests that require git or modify “installed files” preCheck = '' diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index c961dfd069a6..a8e125cc43b5 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { --replace g++ c++ ''; - env.NIX_CFLAGS_COMPILE = ''-I${ilmbase.dev}/include/OpenEXR - -I${openexr.dev}/include/OpenEXR - -I${openfx.dev}/include/OpenFX - ''; + env.NIX_CFLAGS_COMPILE = '' + -I${ilmbase.dev}/include/OpenEXR + -I${openexr.dev}/include/OpenEXR + -I${openfx.dev}/include/OpenFX + ''; buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 615d2590c023..217399deb1c3 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.4.1"; + version = "9.5.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU="; + hash = "sha256-j7Bvv8F9wxrcQlquRa7Pdj5HTUJhwo8Wc1/JbULkUhM="; }; patches = [ diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix deleted file mode 100644 index bae3550f8f05..000000000000 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3.nix ({ - version = "3.20.3"; - sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk="; -} // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix deleted file mode 100644 index cfcaa5551526..000000000000 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook, zlib, gtest, buildPackages -, version, sha256 -, ... -}: - -let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { - pname = "protobuf"; - inherit version; - - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protobuf"; - rev = "v${version}"; - inherit sha256; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gtest.src}/googlemock gmock - cp -r ${gtest.src}/googletest googletest - chmod -R a+w gmock - chmod -R a+w googletest - ln -s ../googletest gmock/gtest - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; - - buildInputs = [ zlib ]; - configureFlags = lib.optional (buildProtobuf != null) "--with-protoc=${buildProtobuf}/bin/protoc"; - - enableParallelBuilding = true; - - doCheck = true; - - dontDisableStatic = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - homepage = "https://developers.google.com/protocol-buffers/"; - license = lib.licenses.bsd3; - mainProgram = "protoc"; - platforms = lib.platforms.unix; - }; -}; -in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) - then (mkProtobufDerivation null buildPackages.stdenv) - else null) stdenv diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 98b4c0a2b7c7..20730810d9cd 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tp3SDOoUAnAvwkID6U63TkeLy6Is+sWn7Oy0nT1f/LQ="; + sha256 = "sha256-fxTlxlnqttZZWRkt+vo4MJJz7DR/FMXcOqUv+/nlV18="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 4b3c8a363eb4..b3b50ae29b18 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -11,30 +11,30 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 ]; - postInstall = - '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ - -e 's|-lz|-L${zlib.out}/lib -lz|g; - s|-lbz2|-L${bzip2.out}/lib -lbz2|g' - ''; + postInstall = '' + sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ + -e 's|-lz|-L${zlib.out}/lib -lz|g; + s|-lbz2|-L${bzip2.out}/lib -lbz2|g' + ''; meta = { description = "Tokyo Cabinet: a modern implementation of DBM"; - longDescription = - '' Tokyo Cabinet is a library of routines for managing a database. The - database is a simple data file containing records, each is a pair of - a key and a value. Every key and value is serial bytes with - variable length. Both binary data and character string can be used - as a key and a value. There is neither concept of data tables nor - data types. Records are organized in hash table, B+ tree, or - fixed-length array. + longDescription = '' + Tokyo Cabinet is a library of routines for managing a database. The + database is a simple data file containing records, each is a pair of + a key and a value. Every key and value is serial bytes with + variable length. Both binary data and character string can be used + as a key and a value. There is neither concept of data tables nor + data types. Records are organized in hash table, B+ tree, or + fixed-length array. - Tokyo Cabinet is developed as the successor of GDBM and QDBM on the - following purposes. They are achieved and Tokyo Cabinet replaces - conventional DBM products: improves space efficiency, improves time - efficiency, improves parallelism, improves usability, improves - robustness, supports 64-bit architecture. - ''; + Tokyo Cabinet is developed as the successor of GDBM and QDBM on the + following purposes. They are achieved and Tokyo Cabinet replaces + conventional DBM products: improves space efficiency, improves time + efficiency, improves parallelism, improves usability, improves + robustness, supports 64-bit architecture. + ''; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 6407840c443c..2c78c15d87ae 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Network interface of the Tokyo Cabinet DBM"; - longDescription = - '' Tokyo Tyrant is a package of network interface to the DBM called + longDescription = '' + Tokyo Tyrant is a package of network interface to the DBM called Tokyo Cabinet. Though the DBM has high performance, you might bother in case that multiple processes share the same database, or remote processes access the database. Thus, Tokyo Tyrant is diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 79abe0f827b8..c1f3aeb7a34a 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ''; doCheck = false; - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Since we rewrote the load path in the dynamic loader for the TCTI # The various tcti implementation should be placed in their target directory # before we could run tests, so we make turn checkPhase into installCheckPhase diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index dd93f49f5946..370a1dfe4ea9 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; nativeCheckInputs = [ gtest ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog"; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index d2840ba33a63..71b540b01ca7 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -29,12 +29,14 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; description = "Vector and matrix math library implemented using C++ templates"; - longDescription = ''vmmlib is a vector and matrix math library implemented - using C++ templates. Its basic functionality includes a vector - and a matrix class, with additional functionality for the - often-used 3d and 4d vectors and 3x3 and 4x4 matrices. - More advanced functionality include solvers, frustum - computations and frustum culling classes, and spatial data structures''; + longDescription = '' + vmmlib is a vector and matrix math library implemented + using C++ templates. Its basic functionality includes a vector + and a matrix class, with additional functionality for the + often-used 3d and 4d vectors and 3x3 and 4x4 matrices. + More advanced functionality include solvers, frustum + computations and frustum culling classes, and spatial data structures + ''; license = licenses.bsd2; homepage = "https://github.com/VMML/vmmlib/"; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 7ad997e6d6da..f06af1417de8 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.11"; + version = "4.9.12"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aX1YU35ATL+f18tGIba6cgNYZvYm3TshHsN7RFD+vI4="; + hash = "sha256-WiOAF1yg18W4Vyyy+rzRe87GQTemvn32bexit4M/HjE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 6120025d5e3e..2d9a295b86ab 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation ({ # Do the building export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} ${lib.optionalString release '' ${lib.optionalString generateIPA '' diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 205fa78371fb..90b737eb2215 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -54,15 +54,17 @@ buildDunePackage rec { homepage = "http://ocsigen.org/eliom/"; description = "OCaml Framework for programming Web sites and client/server Web applications"; - longDescription = ''Eliom is a framework for programming Web sites - and client/server Web applications. It introduces new concepts to - simplify programming common behaviours and uses advanced static - typing features of OCaml to check many properties of the Web site - at compile time. If you want to write a Web application, Eliom - makes possible to write the whole application as a single program - (client and server parts). A syntax extension is used to - distinguish both parts and the client side is compiled to JS using - Ocsigen Js_of_ocaml.''; + longDescription = '' + Eliom is a framework for programming Web sites + and client/server Web applications. It introduces new concepts to + simplify programming common behaviours and uses advanced static + typing features of OCaml to check many properties of the Web site + at compile time. If you want to write a Web application, Eliom + makes possible to write the whole application as a single program + (client and server parts). A syntax extension is used to + distinguish both parts and the client side is compiled to JS using + Ocsigen Js_of_ocaml. + ''; license = lib.licenses.lgpl21; diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index b9831c854a6d..0cdb680def16 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "castor"; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-ng32vuGlGffpkzf3hXu0sNbj0PCDu4DpZnMnbDV9pZk="; + hash = "sha256-f+vz3SFXnZS67dyHQyycONBtfydMVh2XjB/4r9QIak8="; }; - vendorHash = "sha256-0aDT0hPhoPl0U/QbstiGmUHaqDdQb1ReY2hy9FEnzwM="; + vendorHash = "sha256-U/L+iJ/DKCiUEbSUc/BgYeKakv0BdK6Eq5BJjtwb1Yk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 582a6d507e6d..c5a7bcfd0a81 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -1,38 +1,41 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies scikit-learn, numpy, scipy, colorama, + + # tests jupyter, matplotlib, nbconvert, nbformat, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "bayesian-optimization"; - version = "1.5.1"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "bayesian-optimization"; repo = "BayesianOptimization"; rev = "refs/tags/v${version}"; - hash = "sha256-pDgvdQhlJ5aMRGdi2qXRXVCdJRvrOP/Nr0SSZyHH1WM="; + hash = "sha256-XAO+UeHsOFAmUXqzMY/Iws1E738ZnU4Wz7E4YNIeGKY="; }; build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ scikit-learn numpy scipy @@ -49,14 +52,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "bayes_opt" ]; - meta = with lib; { - broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; - description = '' - A Python implementation of global optimization with gaussian processes - ''; + __darwinAllowLocalNetworking = true; + + meta = { + description = "Python implementation of global optimization with gaussian processes"; homepage = "https://github.com/bayesian-optimization/BayesianOptimization"; changelog = "https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.juliendehos ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.juliendehos ]; }; } diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index a60f3f0e4aef..3cee465537b2 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -16,7 +16,7 @@ rich, shapely, - # checks + # tests dask, pytestCheckHook, scipy, @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.5"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A="; + hash = "sha256-lAVH2QGdMyU5A6QTLKujeAh8n1AkCsAtdyKQEqLahTk="; }; build-system = [ diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index e79aab479c3b..9751552d04c2 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.8.7"; + version = "10.9.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-En4zOSIOK+1JGmG6UhGieb4lM/q6akl7xF0s/64ocPg="; + hash = "sha256-XJqbZicRQCiykdXn2R8tOzWPbtrso9IwZYpcTcY7vio="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 28ea4eb3a9f5..fbfb03ca6802 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; rev = "refs/tags/v${version}"; - hash = "sha256-4LS18FPrnGE1tM0pFzAw0+ajDaw9g7MCgIwS2ptrX9c="; + hash = "sha256-T3kcZcRm28WeXZTXBBCpaMxjgB0KmqvWO4gdILH5hCA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 9e324474291d..383a0ba7981b 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.23"; + version = "1.0.24"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-eSvER3lceAEZZ+DhCjvjNW3YpdzCeP/lly5AP3eDnbA="; + hash = "sha256-DnU3u7h/sPCjKLTFppAuPcY8CC0PNdFIlmeGd4xgy3M="; }; build-system = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 62ccb7ef91d0..deefc97b31ac 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.81.1"; + version = "0.82.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-/sY/JijBCcGcbMjoX0yuhFIWvU+TFVN8sRxBx+CDVVs="; + hash = "sha256-hRhRXpiIPrI3umOhsVWLwkSwtEfwevC3fNvJElhKy+I="; }; pythonRelaxDeps = [ "acme" ]; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index effa0f2cd4e2..ed8cc71addac 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -24,10 +24,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/jpvanhal/inflection"; description = "Port of Ruby on Rails inflector to Python"; - maintainers = with lib.maintainers; [ - NikolaMandic - ilya-kolpakov - ]; + maintainers = with lib.maintainers; [ ilya-kolpakov ]; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 9ee9110ef092..bb5a0bdc2ed4 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://keras.io"; changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ NikolaMandic ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 5338d892df34..6859fa08574f 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, libarchive, glibcLocales, mock, @@ -21,6 +22,14 @@ buildPythonPackage rec { sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-recent-libarchive.patch"; + url = "https://github.com/Changaco/python-libarchive-c/commit/a56e9402c76c2fb9631651de7bae07b5fbb0b624.patch"; + hash = "sha256-OLwJQurEFAmwZJbQfhkibrR7Rcnc9vpWwBuhKxgmT7g="; + }) + ]; + LC_ALL = "en_US.UTF-8"; postPatch = '' diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3a58661778e8..3777a84bdb7f 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.51.0"; + version = "1.52.1"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VwsW7wVNSVlZg+RJoQ3C9AuqHL5dFO+f9pyfUbRbrSM="; + hash = "sha256-TTbwhs7rXWIJWOU5bC0wGjXZkBpfBAXb4ycOR9xjTpw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pocketsphinx/default.nix b/pkgs/development/python-modules/pocketsphinx/default.nix new file mode 100644 index 000000000000..16a173efc62d --- /dev/null +++ b/pkgs/development/python-modules/pocketsphinx/default.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildPythonPackage, + cmake, + cython, + fetchFromGitHub, + memory-profiler, + ninja, + pathspec, + pocketsphinx, + pytestCheckHook, + scikit-build, + scikit-build-core, + sounddevice, +}: + +buildPythonPackage rec { + inherit (pocketsphinx) version src; + pname = "pocketsphinx"; + pyproject = true; + + dontUseCmakeConfigure = true; + + env.CMAKE_ARGS = lib.cmakeBool "USE_INSTALLED_POCKETSPHINX" true; + + buildInputs = [ pocketsphinx ]; + + build-system = [ + cmake + cython + ninja + pathspec + scikit-build-core + ]; + + dependencies = [ sounddevice ]; + + nativeCheckInputs = [ + memory-profiler + pytestCheckHook + ]; + + pythonImportsCheck = [ "pocketsphinx" ]; + + meta = with lib; { + description = "Small speech recognizer"; + homepage = "https://github.com/cmusphinx/pocketsphinx"; + changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${version}/NEWS"; + license = with licenses; [ + bsd2 + bsd3 + mit + ]; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index f051004a490c..4de059acab08 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.15"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1UUW3Ym11jR4dxSS1OOVPl6h69I6H782Q4ZeVitty0c="; + hash = "sha256-SuG5x8GWTsCOve3jj1hrtsm37yNRHVFuFjapQafHTbA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 4b3a6fedd030..56cbbf37bc7b 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA="; + hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM="; }; # force pyproj to use ${proj} @@ -37,12 +37,6 @@ buildPythonPackage rec { proj = proj; projdev = proj.dev; }) - - # fix test failure caused by update of EPSG DB - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch"; - hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE="; - }) ]; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 90f439317884..6157a058dee9 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.28.1"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-rF9tRzOdMiISN8vupBt9+1d3pWJqbNS83odtm5SzXZI="; + hash = "sha256-QkcLts2cqhA49/L9nuekf0n+ZRBxKdGL9Ql1sgtyTiw="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 6baaa6c47da2..dc437906d953 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.28.1"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "refs/tags/v${version}"; - hash = "sha256-r8cAht40r1/6rG1xrfx34YEPuPeyBCuSvX7MarLTTCc="; + hash = "sha256-EqrvBXigMjevPERTcz3EXSRaZP2xSEsOxjuiJ/5QOz0="; }; patches = [ diff --git a/pkgs/development/python-modules/securityreporter/default.nix b/pkgs/development/python-modules/securityreporter/default.nix index 3826f8397f5d..087d0f719032 100644 --- a/pkgs/development/python-modules/securityreporter/default.nix +++ b/pkgs/development/python-modules/securityreporter/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "securityreporter"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dongit-org"; repo = "python-reporter"; rev = "refs/tags/v${version}"; - hash = "sha256-Ddq1qjaQemawK+u3ArlsChrkzRbcuaj5LrswyTGwTrg="; + hash = "sha256-fpsvjbPE6iaOmLxykGSkCjkhFTmb8xhXa8pDrWN66KM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index 8629af8a075f..ee20791679c0 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -2,10 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - numpy, + flac, + openai, + openai-whisper, + pocketsphinx, + pyaudio, pytestCheckHook, pythonOlder, - torch, requests, setuptools, soundfile, @@ -26,29 +29,41 @@ buildPythonPackage rec { hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4="; }; + postPatch = '' + # Remove Bundled binaries + rm speech_recognition/flac-* + rm -r third-party + + substituteInPlace speech_recognition/audio.py \ + --replace-fail 'shutil_which("flac")' '"${lib.getExe flac}"' + ''; + build-system = [ setuptools ]; dependencies = [ + pyaudio requests typing-extensions ]; + optional-dependencies = { + whisper-api = [ openai ]; + whisper-local = [ + openai-whisper + soundfile + ]; + }; + nativeCheckInputs = [ - numpy pytestCheckHook - torch - soundfile - ]; + pocketsphinx + ] ++ optional-dependencies.whisper-local ++ optional-dependencies.whisper-api; pythonImportsCheck = [ "speech_recognition" ]; disabledTests = [ - # Test files are missing in source - "test_flac" - # Attribute error - "test_whisper" - # PocketSphinx is not available in Nixpkgs - "test_sphinx" + # Parsed string does not match expected + "test_sphinx_keywords" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 0631b8fc6da3..48e6a50d93da 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1253"; + version = "3.0.1255"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-UQeh2VTIIuTvvJ3+GfY0pfSFLyc2KCg0i5qlglhBAJY="; + hash = "sha256-l0k8fyQ4ba+9uyQiIAsPKTKjmZ0p/QIlC0seqP6LBZY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/truststore/default.nix b/pkgs/development/python-modules/truststore/default.nix index 820d823f8146..a4a6830d83d0 100644 --- a/pkgs/development/python-modules/truststore/default.nix +++ b/pkgs/development/python-modules/truststore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "truststore"; rev = "refs/tags/v${version}"; - hash = "sha256-BP88oQ363XFuRMKZqW8wSm1wl5upU+yEgmwktv65JOU="; + hash = "sha256-BSJneLxwgnD8IJ8IJM43WhmlII5N3qic96SBquMdMnc="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index f769ac1b28c6..7aa3f922e291 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -7,7 +7,6 @@ , wrapQtAppsHook , elfutils , fetchFromGitHub -, fetchpatch , kconfigwidgets , kddockwidgets , ki18n @@ -28,25 +27,16 @@ stdenv.mkDerivation rec { pname = "hotspot"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "refs/tags/v${version}"; - hash = "sha256-FJkDPWqNwoWg/15tvMnwke7PVtWVuqT0gtJBFQE0qZ4="; + hash = "sha256-O2wp19scyHIwIY2AzKmPmorGXDH249/OhSg+KtzOYhI="; fetchSubmodules = true; }; - patches = [ - # Backport stuck UI bug fix - # FIXME: remove in next update - (fetchpatch { - url = "https://github.com/KDAB/hotspot/commit/7639dee8617dba9b88182c7ff4887e8d3714ac98.patch"; - hash = "sha256-aAo9uEy+MBztMhnC5jB08moZBeRCENU22R39pqSBXOY="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 915453cdcc06..965bb2e936f2 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -156,7 +156,7 @@ buildPythonApplication rec { ''; passthru = { - inherit withPlugins; + inherit withPlugins python; updateScript = ./update.sh; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { tests = { diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index cbd3fbcc02da..3f3cbad38827 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-AGHpJaKhu9/rzWPfNWzJPdp/jpQOm28BGAcXuwyNNxE="; + hash = "sha256-yAWU0ruaNAlYTPujPOjmoXgH0iVmYnZeIqn3+fN2P60="; }; dontUnpack = true; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 291c28c0bf25..48ea4c103f31 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { $out/bin/k6 version | grep ${version} > /dev/null ''; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd k6 \ --bash <($out/bin/k6 completion bash) \ --fish <($out/bin/k6 completion fish) \ diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 6e70fbcfcde5..ce4cf1de1f18 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { meta = { description = "C code complexity measurement tool"; - longDescription = - '' GNU Complexity is a tool designed for analyzing the complexity of C - program functions. It is very similar to the McCabe scoring, but - addresses several issues not considered in that scoring scheme. - ''; + longDescription = '' + GNU Complexity is a tool designed for analyzing the complexity of C + program functions. It is very similar to the McCabe scoring, but + addresses several issues not considered in that scoring scheme. + ''; license = lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 8aa0afd7011e..13d459579826 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { description = "C preprocessor directive indenter"; mainProgram = "cppi"; - longDescription = - '' GNU cppi indents C preprocessor directives to reflect their nesting - and ensure that there is exactly one space character between each #if, - #elif, #define directive and the following token. The number of - spaces between the `#' and the following directive must correspond - to the level of nesting of that directive. - ''; + longDescription = '' + GNU cppi indents C preprocessor directives to reflect their nesting + and ensure that there is exactly one space character between each #if, + #elif, #define directive and the following token. The number of + spaces between the `#' and the following directive must correspond + to the level of nesting of that directive. + ''; license = lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index 73907cac3731..40fbd86b5927 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-GD4P+SXl9hyv0CxOximOMz+Gzi85kPahsiz0wHRqSWk="; + hash = "sha256-lCDjqvdjiQktyFAp3KuFHehwapd3BiLxMSLsNK+wDDo="; }; - cargoHash = "sha256-luKtu9g+NtlwRhC1icpIxkBvP3GtggpKoj7Sx4anLAM="; + cargoHash = "sha256-RmeV2EYHGbMMAeerQkHcYav+RIVY68Tj66zjcFgjUfQ="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/pkgs/development/tools/xcodes/default.nix b/pkgs/development/tools/xcodes/default.nix index f2fe98c0d493..3b92959d2f44 100644 --- a/pkgs/development/tools/xcodes/default.nix +++ b/pkgs/development/tools/xcodes/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "xcodes"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "XcodesOrg"; repo = "xcodes"; rev = finalAttrs.version; - hash = "sha256-ARrSQ9ozM90Yg7y4WdU7jjNQ64sXHuhxZh/iNJcFfY0="; + hash = "sha256-vksfvrx0TqtjcOHn38Ey3P6jIFYF4CbD3SVICVFINSU="; }; nativeBuildInputs = [ swift swiftpm makeWrapper ]; diff --git a/pkgs/development/tools/xcodes/generated/default.nix b/pkgs/development/tools/xcodes/generated/default.nix index 32ec081a9380..669a8e300026 100644 --- a/pkgs/development/tools/xcodes/generated/default.nix +++ b/pkgs/development/tools/xcodes/generated/default.nix @@ -5,9 +5,9 @@ "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg"; "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7"; "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l"; - "LegibleError" = "08x5agha74chq1z5c7c5r2vasdk81pyl2k085miapd4l3jszz4fj"; + "LegibleError" = "137hc96cqpiwsyybj2xawyfmqh7rmk1khqkiqp3616ql909mh99y"; "Path.swift" = "05qk7kwb1254zwdxc3sjc3gprccnv9fwapmy5y6ygxjz8a6jfk83"; - "PromiseKit" = "0vlkd4famjgbd4qs2ldi5aqg13nk77h7ddsdigyxxzgkwgxl076d"; + "PromiseKit" = "19pkhk505pz03hqmv8h1lgm83iw5jha6j1v06fyzz0xar2ywv6vg"; "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0"; "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9"; "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8"; diff --git a/pkgs/development/tools/xcodes/generated/workspace-state.json b/pkgs/development/tools/xcodes/generated/workspace-state.json index f13a3a54c6d4..cddcff170085 100644 --- a/pkgs/development/tools/xcodes/generated/workspace-state.json +++ b/pkgs/development/tools/xcodes/generated/workspace-state.json @@ -62,8 +62,8 @@ }, "state": { "checkoutState": { - "revision": "909e9bab3ded97350b28a5ab41dd745dd8aa9710", - "version": "1.0.4" + "revision": "bc596702d7ff618c3f90ba480eeb48b3e83a2fbe", + "version": "1.0.6" }, "name": "sourceControlCheckout" }, @@ -96,8 +96,8 @@ }, "state": { "checkoutState": { - "revision": "1c296a8637838901d2b01e4c46875ee749506133", - "version": "6.8.5" + "revision": "8a98e31a47854d3180882c8068cc4d9381bf382d", + "version": "6.22.1" }, "name": "sourceControlCheckout" }, diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index 7de90857c06e..35194301772b 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small single “window” launcher for the WebKit WPE port"; + homepage = "https://github.com/Igalia/cog"; + mainProgram = "cog"; license = licenses.mit; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.linux; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 7732ce9f4822..0b2f7438e698 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { rev = "VERSION_${underscoreVersion}"; sha256 = "0ha6r7bcgf6pcn5gbd2sl7835givhda1jql49c232f1iair1yqyp"; }; - patchPhase = ''substituteInPlace configure \ - --replace /usr/local / + patchPhase = '' + substituteInPlace configure \ + --replace /usr/local / ''; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index a228471f1623..c3402eda4082 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -34,8 +34,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple retro style arcade side-scroller game"; - longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. - It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator + longDescription = '' + FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. + It has ten different levels and a level editor to create new levels or modify the existing. + ''; # from https://libregamewiki.org/FLTrator homepage = "https://fltrator.sourceforge.net/"; platforms = platforms.linux; maintainers = [ maintainers.marius851000 ]; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 43001343b748..b92f78ab5d60 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -189,10 +189,10 @@ stdenv.mkDerivation { --add-flags "-jar $out/share/mindustry.jar" \ ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \ - --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/'' + lib.optionalString enableWayland '' \ - --set SDL_VIDEODRIVER wayland \ - --set SDL_VIDEO_WAYLAND_WMCLASS Mindustry - '' + '' + --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland '' + --set SDL_VIDEODRIVER wayland \ + --set SDL_VIDEO_WAYLAND_WMCLASS Mindustry + ''} # Retain runtime depends to prevent them from being cleaned up. # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there, diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bdb0520f6a4b..f409fe00dffc 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -39,16 +39,6 @@ "sha256": "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b", "version": "6.1.112" }, - "6.10": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-v6.10.12-hardened1.patch", - "sha256": "07z35f4nqj9vgj2ynq7spgckb770a0w0906m7l28i1x0kch2kr3j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.12-hardened1/linux-hardened-v6.10.12-hardened1.patch" - }, - "sha256": "1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j", - "version": "6.10.12" - }, "6.6": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e4f61b03c104..98391c4d0433 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,34 +1,30 @@ { "testing": { - "version": "6.12-rc3", - "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw" + "version": "6.12-rc4", + "hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk" }, "6.1": { - "version": "6.1.113", - "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl" + "version": "6.1.114", + "hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2" }, "5.15": { - "version": "5.15.168", - "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng" + "version": "5.15.169", + "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676" }, "5.10": { - "version": "5.10.227", - "hash": "sha256:1hknbfxq59731zmxgig7b69lfdmgh5jdg391hapvmlrh07hrvq2j" + "version": "5.10.228", + "hash": "sha256:0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n" }, "5.4": { "version": "5.4.284", "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.57", - "hash": "sha256:1cxpmgbp8hhwa045gappf2wzh3kk1iw2xivsxzhvi6bgz5p45kk6" - }, - "6.10": { - "version": "6.10.14", - "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" + "version": "6.6.58", + "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7" }, "6.11": { - "version": "6.11.4", - "hash": "sha256:0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x" + "version": "6.11.5", + "hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527" } } diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9e15991dd635..551fb58ed4ee 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,4 +60,14 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + # Backport upstream fix for very annoying Tailscale issue + # FIXME: remove when merged upstream + netfilter-typo-fix = { + name = "netfilter-typo-fix"; + patch = fetchpatch { + url = "https://lore.kernel.org/netdev/20241021094536.81487-3-pablo@netfilter.org/raw"; + hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4="; + }; + }; } diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index afca9bb2a44e..f4eda83e6f64 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,16 +5,16 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.11.2"; #zen + version = "6.11.5"; #zen suffix = "zen1"; #zen - sha256 = "1pwhdx8dcih0q3xj2hndd9vmz1xclrp4dw9yk0p1hi03mb634s40"; #zen + sha256 = "1w342k54ns6rwkk13l9f7h0qzikn6hbnb2ydxyqalrmll8n2g237"; #zen isLqx = false; }; # ./update-zen.py lqx lqx = { - version = "6.11.2"; #lqx + version = "6.11.5"; #lqx suffix = "lqx1"; #lqx - sha256 = "0q5zdzb26azshn1n8fc5zy5n2sa7sz3q4khkjivafz6pyli1wfl8"; #lqx + sha256 = "0ql7nw6sph4ai44n66c7l06aj4ibhdy45415yzgibin1jg9rqa6d"; #lqx isLqx = true; }; }; @@ -83,8 +83,6 @@ let HZ = freeform "1000"; HZ_1000 = yes; - # Alternative zpool for zswap - Z3FOLD = yes; } // lib.optionalAttrs (isLqx) { # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; @@ -101,7 +99,6 @@ let # Swap storage is compressed with LZ4 using zswap ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no; - ZSWAP_ZPOOL_DEFAULT_Z3FOLD = yes; # Fix error: unused option: XXX. CFS_BANDWIDTH = lib.mkForce (option no); diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ee5aa5e8eaea..52925f1ace94 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -39,12 +39,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.120"; - sha256_64bit = "sha256-gBkoJ0dTzM52JwmOoHjMNwcN2uBN46oIRZHAX8cDVpc="; - sha256_aarch64 = "sha256-dzTEUuSIWKEuAMhsL9QkR7CCHpm6m9ZwtGSpSKqwJdc="; - openSha256 = "sha256-O3OrGGDR+xrpfyPVQ04aM3eGI6aWuZfRzmaPjMfnGIg="; - settingsSha256 = "sha256-fPfIPwpIijoUpNlAUt9C8EeXR5In633qnlelL+btGbU="; - persistencedSha256 = "sha256-ztEemWt0VR+cQbxDmMnAbEVfThdvASHni4SJ0dTZ2T4="; + version = "550.127.05"; + sha256_64bit = "sha256-04TzT10qiWvXU20962ptlz2AlKOtSFocLuO/UZIIauk="; + sha256_aarch64 = "sha256-3wsGqJvDf8io4qFSqbpafeHHBjbasK5i/W+U6TeEeBY="; + openSha256 = "sha256-r0zlWPIuc6suaAk39pzu/tp0M++kY2qF8jklKePhZQQ="; + settingsSha256 = "sha256-cUSOTsueqkqYq3Z4/KEnLpTJAryML4Tk7jco/ONsvyg="; + persistencedSha256 = "sha256-8nowXrL6CRB3/YcoG1iWeD4OCYbsYKOOPE374qaa4sY="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 0626fc0a91a7..fc3915c66a60 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -22,8 +22,7 @@ stdenv.mkDerivation { preConfigure = "substituteInPlace Makefile --replace /usr/local $out"; meta = with lib; { - description = ''A FUSE filesystem intended to be used - like Apache mod_rewrite''; + description = "A FUSE filesystem intended to be used like Apache mod_rewrite"; homepage = "https://github.com/sloonz/rewritefs"; license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/servers/dict/dictd-db-collector.nix index 793cbf66a46d..83844f9a5a5f 100644 --- a/pkgs/servers/dict/dictd-db-collector.nix +++ b/pkgs/servers/dict/dictd-db-collector.nix @@ -13,7 +13,7 @@ let link_arguments = map - (x: '' "${x.filename}" '') + (x: ''"${x.filename}" '') dictlist; databases = lib.concatStrings (map (x: diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index d9f3c7a99c8c..c07aa4293587 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { meta = { description = "dictd-compatible version of WordNet"; - longDescription = - '' WordNet® is a large lexical database of English. This package makes - the wordnet data available to dictd and by extension for lookup with - the dict command. ''; + longDescription = '' + WordNet® is a large lexical database of English. This package makes + the wordnet data available to dictd and by extension for lookup with + the dict command. + ''; homepage = "https://wordnet.princeton.edu/"; diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 52ee2d92eccd..4db100a94f9a 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2024.10.3"; + version = "2024.10.4"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; rev = "refs/tags/${version}"; - hash = "sha256-6XLXCD7ItTGCRN9XQUetZfZBuMbFEmho6IOyFs4m0ek="; + hash = "sha256-EeFDUxZ7/W5Ng+d56mOCeRntga0uU55OQsaPWzM/bcY="; }; dependencies = [ pymodbus ]; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f68d6b880db3..a9ccebea6d11 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -506,8 +506,8 @@ let self = { name = "njs"; src = fetchhg { url = "https://hg.nginx.org/njs"; - rev = "0.8.1"; - sha256 = "sha256-bFHrcA1ROMwYf+s0EWOXzkru6wvfRLvjvN8BV/r2tMc="; + rev = "0.8.4"; + sha256 = "sha256-SooPFx4WNEezPD+W/wmMLY+FdkGRoojLNUFbhn3Riyg="; name = "nginx-njs"; }; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 987ec3f5419b..3e4e945aca61 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.2.0"; + version = "3.2.1"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-dche8MbVSlwKMD/znOCj80FNf5KZmEuI3uodrFLrmjM="; + hash = "sha256-PhvXuRWpOA+5sPiTSDEwpZ8KEfV/UHM2W6RnG9z9Sp0="; }; vendorHash = null; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 83cd922bc517..99bc3be76f17 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -13,7 +13,6 @@ , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , uthash -, fetchpatch , nixosTests }: @@ -30,24 +29,15 @@ let in stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.18"; + version = "2.0.20"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - hash = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; + hash = "sha256-oZo6J6mxMC05jJ8RXIunOMB3kptA6FElchKlg4qmuQ8="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - (fetchpatch { - name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277 - url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch"; - sha256 = "14syi2c1rks8sl2aw09my276w45yq1iasvzkqcrqwy4drdqrf069"; - revert = true; - }) - ]; - postPatch = '' for f in html manpage ; do substituteInPlace man/$f.xsl \ diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 115bf78be927..4bea37d9c7a2 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Program invocation and execution supervisor"; - longDescription = - '' The name Pies (pronounced "p-yes") stands for Program Invocation and + longDescription = '' + The name Pies (pronounced "p-yes") stands for Program Invocation and Execution Supervisor. This utility starts and controls execution of external programs, called components. Each component is a stand-alone program, which is executed in the foreground. Upon diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 2fcdc7f4a655..abeed3b24435 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -156,11 +156,6 @@ buildGoModule rec { # Reduce closure size for client machines outputs = [ "out" "client" ]; - prePatch = '' - # TODO: remove after https://github.com/NixOS/nixpkgs/pull/332852 merges - sed -i 's/go 1.22.6/go 1.22.5/' go.mod - ''; - preBuild = '' cp -r ${webassets} webassets '' + lib.optionalString withRdpClient '' diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index afd1ac14970b..448f7a2ca86f 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { meta = { description = "User-space NFSv3 file system server"; - longDescription = - '' UNFS3 is a user-space implementation of the NFSv3 server - specification. It provides a daemon for the MOUNT and NFS - protocols, which are used by NFS clients for accessing files on the - server. - ''; + longDescription = '' + UNFS3 is a user-space implementation of the NFSv3 server + specification. It provides a daemon for the MOUNT and NFS + protocols, which are used by NFS clients for accessing files on the + server. + ''; # The old http://unfs3.sourceforge.net/ has a # http-equiv="refresh" pointing here, so we can assume that diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index c1c72db242dc..312ae182466c 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -2,22 +2,27 @@ buildGo123Module rec { pname = "webdav"; - version = "5.3.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-F7ehl7Q/66ah6/N06U8Ld3bUjuF5tpJlNS/aWEorQaI="; + sha256 = "sha256-a1XAlmEW8gNTgVZiJ200CP/wvbwvyv4Lc3L6KP/4Mik="; }; - vendorHash = "sha256-FvTDqGr3B05osuJvLj7J04JMeamZc/X6YeLY24ej7Ak="; + vendorHash = "sha256-d8WauJ1i429dr79iHgrbFRZCmx+W6OobSINy8aNGG6w="; + + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Simple WebDAV server"; homepage = "https://github.com/hacdias/webdav"; license = licenses.mit; - maintainers = with maintainers; [ pmy ]; + maintainers = with maintainers; [ + pmy + pbsds + ]; mainProgram = "webdav"; }; } diff --git a/pkgs/shells/ion/Cargo.lock b/pkgs/shells/ion/Cargo.lock index e8355a3928cd..22b55155030e 100644 --- a/pkgs/shells/ion/Cargo.lock +++ b/pkgs/shells/ion/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph_rasterizer" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "adler" @@ -22,9 +22,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -35,7 +35,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "rusttype", "walkdir", "xdg", @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -98,7 +98,7 @@ checksum = "da47c46001293a2c4b744d731958be22cff408a2ab76e2279328f9713b1267b4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -111,20 +111,20 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bitflags" @@ -132,6 +132,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "blake2b_simd" version = "0.5.11" @@ -149,18 +155,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - [[package]] name = "builtins-proc" version = "0.1.0" @@ -168,37 +162,37 @@ dependencies = [ "darling", "ion-shell", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.11.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "calculate" version = "0.7.0" -source = "git+https://gitlab.redox-os.org/redox-os/calc#9f975c504bf6d1a2bcf44992866233f49afaeb29" +source = "git+https://gitlab.redox-os.org/redox-os/calc?rev=d2719efb67ab38c4c33ab3590822114453960da5#d2719efb67ab38c4c33ab3590822114453960da5" dependencies = [ "atty", "clap", @@ -226,9 +220,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -259,7 +253,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -272,10 +266,10 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types", "libc", @@ -284,14 +278,14 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types", "libc", @@ -300,15 +294,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "core-graphics-types", - "foreign-types", "libc", "objc", ] @@ -337,11 +330,11 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys 0.8.6", "libc", ] @@ -353,9 +346,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -363,7 +356,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation 0.7.0", "foreign-types", "libc", @@ -375,8 +368,8 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", - "core-foundation 0.9.3", + "bitflags 1.3.2", + "core-foundation 0.9.4", "core-graphics-types", "foreign-types", "libc", @@ -384,13 +377,12 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "foreign-types", + "bitflags 1.3.2", + "core-foundation 0.9.4", "libc", ] @@ -409,9 +401,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 1.0.0", ] @@ -427,7 +419,7 @@ dependencies = [ "clap", "criterion-plot", "csv", - "itertools 0.10.3", + "itertools 0.10.5", "lazy_static", "num-traits", "oorandom", @@ -449,72 +441,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast", - "itertools 0.10.3", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", + "itertools 0.10.5", ] [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", - "once_cell", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "csv" -version = "1.1.6" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -546,7 +517,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.9.3", - "syn", + "syn 1.0.109", ] [[package]] @@ -557,15 +528,29 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", ] [[package]] name = "decimal" version = "2.1.0" -source = "git+https://github.com/alkis/decimal.git#83cfb19d07188106e9399b36d2496a1a07ee619f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8ab77e91baeb15034c3be91e87bff4665c9036216148e4996d9a9f5792114d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "libc", ] @@ -588,7 +573,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -599,27 +584,7 @@ checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", + "syn 1.0.109", ] [[package]] @@ -639,11 +604,11 @@ dependencies = [ [[package]] name = "dlib" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.7.3", + "libloading 0.8.3", ] [[package]] @@ -658,14 +623,14 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "either" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "errno-dragonfly" @@ -710,7 +675,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fuchsia-zircon-sys", ] @@ -722,9 +687,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -737,9 +702,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -747,15 +712,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -764,27 +729,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -810,9 +775,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "libc", @@ -821,9 +786,9 @@ dependencies = [ [[package]] name = "gfx" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b" +checksum = "eb754057e8bfb8fdb38a33b9caa213dbeb2cbbef2003fe6b2cb36dff96098e0a" dependencies = [ "draw_state", "gfx_core", @@ -836,7 +801,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441" dependencies = [ - "bitflags", + "bitflags 1.3.2", "draw_state", "log", ] @@ -904,9 +869,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glutin" @@ -917,7 +882,7 @@ dependencies = [ "android_glue", "cgl", "cocoa 0.23.0", - "core-foundation 0.9.3", + "core-foundation 0.9.4", "glutin_egl_sys", "glutin_emscripten_sys", "glutin_gles2_sys", @@ -937,9 +902,9 @@ dependencies = [ [[package]] name = "glutin_egl_sys" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abb6aa55523480c4adc5a56bbaa249992e2dddb2fc63dc96e04a3355364c211" +checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" dependencies = [ "gl_generator 0.14.0", "winapi 0.3.9", @@ -963,9 +928,9 @@ dependencies = [ [[package]] name = "glutin_glx_sys" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e393c8fc02b807459410429150e9c4faffdb312d59b8c038566173c81991351" +checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468" dependencies = [ "gl_generator 0.14.0", "x11-dl", @@ -982,9 +947,15 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" @@ -1013,7 +984,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-iter", - "num-rational", + "num-rational 0.3.2", "num-traits", "png", "scoped_threadpool", @@ -1105,24 +1076,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni-sys" @@ -1141,9 +1106,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1193,7 +1158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "ryu", "static_assertions", @@ -1201,9 +1166,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.126" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -1217,19 +1182,40 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.3" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "windows-targets 0.52.4", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.5.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", ] [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1237,12 +1223,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "malloc_buf" @@ -1255,9 +1238,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -1277,12 +1260,6 @@ dependencies = [ "autocfg", ] -[[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.3.7" @@ -1390,7 +1367,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1401,9 +1378,9 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" [[package]] name = "net2" -version = "0.2.37" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ "cfg-if 0.1.10", "libc", @@ -1416,7 +1393,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 0.1.10", "libc", @@ -1428,7 +1405,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", @@ -1439,41 +1416,31 @@ name = "nix" version = "0.23.1" source = "git+https://github.com/nix-rust/nix.git?rev=ff6f8b8a#ff6f8b8a26c8d61f4341e441acf405402b46a430" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset", ] -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "num" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", - "num-rational", + "num-rational 0.4.1", "num-traits", ] [[package]] name = "num-bigint" -version = "0.3.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1482,28 +1449,27 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -1515,6 +1481,17 @@ name = "num-rational" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-bigint", @@ -1524,23 +1501,13 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" version = "0.4.3" @@ -1560,7 +1527,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1588,9 +1555,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -1609,9 +1576,9 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.6.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" +checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" dependencies = [ "ttf-parser", ] @@ -1624,7 +1591,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -1634,41 +1601,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", + "parking_lot_core 0.9.9", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", - "windows-sys", + "windows-targets 0.48.5", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permutate" @@ -1678,9 +1645,9 @@ checksum = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1690,9 +1657,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piston" -version = "0.53.1" +version = "0.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f483bc0f9316e80f27c9f083fb20e8ae881a9799ad792cf683a059f3f58d6e6" +checksum = "6e465487e1063ebe4103bc0fb65bc3dd604b635b2012a41530d3a5f77106e526" dependencies = [ "pistoncore-event_loop", "pistoncore-input 1.0.1", @@ -1856,7 +1823,7 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd3f576d1a49fe2a86716b52ae72896319b05eb4d3abe41fb01abd3241cd5f7a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "piston-viewport", "serde", "serde_derive", @@ -1868,7 +1835,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2977fed6eb16c554fd445a09a50c8a0c250f4c50f752be46a7bd9dcc5ba471f0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "piston-viewport", "serde", "serde_derive", @@ -1886,15 +1853,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plotters" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -1905,15 +1872,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] @@ -1924,7 +1891,7 @@ version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "deflate", "miniz_oxide 0.3.7", @@ -1932,9 +1899,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" @@ -1945,44 +1912,20 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.42" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.20" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2077,26 +2020,22 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2116,8 +2055,8 @@ checksum = "9f4c8858baa4ad3c8bcc156ae91a0ffe22b76a3975c40c49b4f04c15c6bce0da" [[package]] name = "redox_liner" -version = "0.5.1" -source = "git+https://gitlab.redox-os.org/redox-os/liner#616e61657fd611c3fe5818e6151300cbcbdd5c06" +version = "0.5.2" +source = "git+https://gitlab.redox-os.org/redox-os/liner#acc38f5f2922c56b6c5a29af287c5ac8ceb066d9" dependencies = [ "bytecount", "itertools 0.8.2", @@ -2132,26 +2071,32 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "redox_termios" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" -dependencies = [ - "redox_syscall", -] +checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.7", - "redox_syscall", + "getrandom 0.2.12", + "libredox 0.1.3", "rust-argon2", "thiserror", "zeroize", @@ -2159,26 +2104,32 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rust-argon2" @@ -2194,25 +2145,19 @@ dependencies = [ [[package]] name = "rusttype" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" +checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", ] -[[package]] -name = "rustversion" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" - [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -2225,9 +2170,9 @@ dependencies = [ [[package]] name = "scoped-tls" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scoped_threadpool" @@ -2237,9 +2182,9 @@ checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scopes" @@ -2247,9 +2192,12 @@ version = "0.1.0" [[package]] name = "serde" -version = "1.0.140" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_cbor" @@ -2263,32 +2211,33 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.57", ] [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "itoa 1.0.2", + "itoa", "ryu", "serde", ] [[package]] name = "serial_test" -version = "0.8.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eec42e7232e5ca56aa59d63af3c7f991fe71ee6a3ddd2d3480834cf3902b007" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" dependencies = [ + "dashmap", "futures", "lazy_static", "log", @@ -2298,15 +2247,13 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.8.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b95bb2f4f624565e8fe8140c789af7e2082c0e0561b5a82a1b678baa9703dc" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "rustversion", - "syn", + "syn 2.0.57", ] [[package]] @@ -2330,9 +2277,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2347,9 +2294,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" @@ -2358,7 +2305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" dependencies = [ "andrew", - "bitflags", + "bitflags 1.3.2", "calloop", "dlib 0.4.2", "lazy_static", @@ -2372,12 +2319,11 @@ dependencies = [ [[package]] name = "spin_sleep" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" +checksum = "368a978649eaf70006b082e79c832bd72556ac1393eaf564d686e919dca2347f" dependencies = [ - "once_cell", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -2409,9 +2355,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -2419,25 +2365,25 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] name = "termion" -version = "1.5.6" -source = "git+https://gitlab.redox-os.org/redox-os/termion#8054e082b01c3f45f89f0db96bc374f1e378deb1" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4648c7def6f2043b2568617b9f9b75eae88ca185dbc1f1fda30e95a85d49d7d" dependencies = [ "libc", + "libredox 0.0.2", "numtoa", - "redox_syscall", "redox_termios", ] @@ -2452,22 +2398,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.57", ] [[package]] @@ -2493,18 +2439,18 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "ttf-parser" -version = "0.6.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "types-rs" @@ -2517,27 +2463,21 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "users" @@ -2551,9 +2491,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" @@ -2571,7 +2511,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.12", ] [[package]] @@ -2589,12 +2529,6 @@ dependencies = [ "piston-float", ] -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "vte" version = "0.10.1" @@ -2618,12 +2552,11 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] @@ -2641,9 +2574,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2651,24 +2584,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.57", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2676,22 +2609,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-client" @@ -2699,7 +2632,7 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.20.0", @@ -2748,7 +2681,7 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -2771,16 +2704,16 @@ version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" dependencies = [ - "dlib 0.5.0", + "dlib 0.5.2", "lazy_static", "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2788,9 +2721,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "winapi" @@ -2822,9 +2755,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi 0.3.9", ] @@ -2837,46 +2770,126 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows-targets 0.52.4", ] [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winit" @@ -2884,9 +2897,9 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" dependencies = [ - "bitflags", - "cocoa 0.24.0", - "core-foundation 0.9.3", + "bitflags 1.3.2", + "cocoa 0.24.1", + "core-foundation 0.9.4", "core-graphics 0.22.3", "core-video-sys", "dispatch", @@ -2921,56 +2934,49 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.19.1" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "lazy_static", "libc", + "once_cell", "pkg-config", ] [[package]] name = "xcursor" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" -dependencies = [ - "dirs", -] +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "zeroize" -version = "1.5.7" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.57", ] diff --git a/pkgs/shells/ion/build-script.patch b/pkgs/shells/ion/build-script.patch index 869289289592..738a2178bf0a 100644 --- a/pkgs/shells/ion/build-script.patch +++ b/pkgs/shells/ion/build-script.patch @@ -1,17 +1,17 @@ +diff --git a/build.rs b/build.rs +index 9a32b7a2..77bc41bc 100644 --- a/build.rs +++ b/build.rs -@@ -23,13 +23,7 @@ fn write_version_file() -> io::Result<()> { - let target = env::var("TARGET").unwrap(); - let version_fname = Path::new(&env::var("OUT_DIR").unwrap()).join("version_string"); +@@ -25,10 +25,9 @@ fn write_version_file() -> io::Result<()> { let mut version_file = File::create(&version_fname)?; -- write!( -- &mut version_file, + write!( + &mut version_file, - "r#\"ion {} ({})\nrev {}\"#", -- version, ++ "r#\"ion {} ({})\nrev \"#", + version, - target, - get_git_rev()?.trim() -- )?; -+ write!(&mut version_file, "r#\"ion {version} ({target})\n\"#")?; ++ target + )?; Ok(()) - } - + } \ No newline at end of file diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index a5e7f9edeb9a..22fef6ee4f74 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -1,31 +1,29 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitLab }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "ion"; - version = "unstable-2022-11-27"; + version = "unstable-2024-09-20"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.redox-os.org"; owner = "redox-os"; repo = "ion"; - rev = "3bb8966fc99ba223033e1e02b0a6d50fc25cbef4"; - sha256 = "sha256-6KW/YkMQFeGb1i+1YdADZRW89UruHsfPhMq9Cvxjl/4="; + rev = "8acd140eeec76cd5efbd36f9ea8425763200a76b"; + hash = "sha256-jiJ5XW7S6/pVEOPYJKurolLI3UrOyuaEP/cqm1a0rIU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "calculate-0.7.0" = "sha256-wUmi8XLgEMgECeaCM0r1KxJ+oTd47QozgFBANKSwt24="; - "decimal-2.1.0" = "sha256-s5mDRCkaDBUdaywYEJzTfe7qH25sG5UUo5iVmPE+zrw="; + "calculate-0.7.0" = "sha256-3CI+7TZeW1sk6pBigxESK/E7G+G1/MniVIn4sqfk7+w="; "nix-0.23.1" = "sha256-yWJYrQt9piJHhqBkH/hn9dsXR8oqzl0RKPrzx9fvqlw="; "object-pool-0.5.3" = "sha256-LWP0b62sk2dcqnQEEvLmZVvWSVLJ722yH/zIIPL93W4="; - "redox_liner-0.5.1" = "sha256-OT9E4AwQgm5NngcCtcno1VKhkS4d8Eq/l+8aYHvXtTY="; + "redox_liner-0.5.2" = "sha256-ZjVLACkyOT6jVRWyMj0ixJwCv6IjllCLHNTERlncIpk="; "small-0.1.0" = "sha256-QIzEfFc0EDEllf+YxVyV7j/PvC7nVWiK0YYBoZBQZ3Q="; - "termion-1.5.6" = "sha256-NTY/2SbqkSyslnN5Xg6lrQ0MTrOhTMHqN+XXqN6Nkr8="; }; }; @@ -34,24 +32,16 @@ rustPlatform.buildRustPackage rec { ./build-script.patch ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - # test assumes linux - "--skip=binary::completer::tests::filename_completion" - ]; - passthru = { shellPath = "/bin/ion"; }; meta = with lib; { description = "Modern system shell with simple (and powerful) syntax"; - mainProgram = "ion"; homepage = "https://gitlab.redox-os.org/redox-os/ion"; license = licenses.mit; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [dywedir arthsmn]; + mainProgram = "ion"; + platforms = platforms.unix; }; } diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 7b606178973e..122a16680e68 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; description = "Restricted User Shell"; - longDescription = - '' GNU Rush is a Restricted User Shell, designed for sites + longDescription = '' + GNU Rush is a Restricted User Shell, designed for sites providing limited remote access to their resources, such as svn or git repositories, scp, or the like. Using a sophisticated configuration file, Rush gives you complete diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index b442e25fb215..389d6f0daf0d 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -1,28 +1,28 @@ -{ lib -, python3 -, fetchFromGitHub -, nix-update-script +{ + lib, + python3, + python3Packages, + fetchFromGitHub, + nix-update-script, }: let pname = "whisper-ctranslate2"; - version = "0.4.5"; + version = "0.4.6"; in -python3.pkgs.buildPythonApplication { +python3Packages.buildPythonApplication { inherit pname version; pyproject = true; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "Softcatala"; repo = "whisper-ctranslate2"; - rev = version; - hash = "sha256-hnotnEpw+5hVWVKknZHqiBSeDWy9XEjL3ojQD2ZXbAM="; + rev = "refs/tags/${version}"; + hash = "sha256-sIkZIzSGqPbjg9BMkcciGFr024Pd8ohXl/NdbsxhjH0="; }; - build-system = [ python3.pkgs.setuptools ]; + build-system = [ python3Packages.setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ ctranslate2 faster-whisper numpy @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication { tqdm ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ nose2 ]; @@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Whisper command line client compatible with original OpenAI client based on CTranslate2"; homepage = "https://github.com/Softcatala/whisper-ctranslate2"; changelog = "https://github.com/Softcatala/whisper-ctranslate2/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; mainProgram = "whisper-ctranslate2"; }; } diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 70922a0f32b3..c356f17cb43b 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -83,16 +83,18 @@ multiStdenv.mkDerivation (finalAttrs: { }; # Unpack subproject sources - postUnpack = ''( - cd "$sourceRoot/subprojects" - cp -R --no-preserve=mode,ownership ${asio} asio - cp -R --no-preserve=mode,ownership ${bitsery} bitsery - cp -R --no-preserve=mode,ownership ${clap} clap - cp -R --no-preserve=mode,ownership ${function2} function2 - cp -R --no-preserve=mode,ownership ${ghc_filesystem} ghc_filesystem - cp -R --no-preserve=mode,ownership ${tomlplusplus} tomlplusplus - cp -R --no-preserve=mode,ownership ${vst3} vst3 - )''; + postUnpack = '' + ( + cd "$sourceRoot/subprojects" + cp -R --no-preserve=mode,ownership ${asio} asio + cp -R --no-preserve=mode,ownership ${bitsery} bitsery + cp -R --no-preserve=mode,ownership ${clap} clap + cp -R --no-preserve=mode,ownership ${function2} function2 + cp -R --no-preserve=mode,ownership ${ghc_filesystem} ghc_filesystem + cp -R --no-preserve=mode,ownership ${tomlplusplus} tomlplusplus + cp -R --no-preserve=mode,ownership ${vst3} vst3 + ) + ''; patches = [ # Hard code bitbridge & runtime dependencies diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 4cf618826b8f..0926461974d7 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - installPhase = - '' mkdir -p "$out/bin" - cp -v httpfs2 "$out/bin" + installPhase = '' + mkdir -p "$out/bin" + cp -v httpfs2 "$out/bin" - mkdir -p "$out/share/man/man1" - cp -v *.1 "$out/share/man/man1" - ''; + mkdir -p "$out/share/man/man1" + cp -v *.1 "$out/share/man/man1" + ''; meta = { description = "FUSE-based HTTP filesystem for Linux"; diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index a4173de6cb22..ddc27c1029e2 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-ObNBeHmQ4VqnZdUbKxLxuXeRw2jVPQxroO2HK4Wp8tg="; + sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 483be779202c..391234ae1903 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -107,15 +107,17 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "doc" "man" ]; # Unpack subproject sources - postUnpack = ''( - cd "$sourceRoot/subprojects" - ${lib.optionalString finalAttrs.finalPackage.doCheck '' - cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka - ''} - cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version} - cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} - cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} - )''; + postUnpack = '' + ( + cd "$sourceRoot/subprojects" + ${lib.optionalString finalAttrs.finalPackage.doCheck '' + cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka + ''} + cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version} + cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} + cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} + ) + ''; patches = [ # Add @libraryPath@ template variable to fix loading the preload diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 29b4c4b35fe9..da1aeb806eca 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -37,21 +37,21 @@ stdenv.mkDerivation rec { meta = { description = "Powerful C/C++ library for exporting 2D vector graphics"; - longDescription = - '' The GNU plotutils package contains software for both programmers and - technical users. Its centerpiece is libplot, a powerful C/C++ - function library for exporting 2-D vector graphics in many file - formats, both vector and raster. It can also do vector graphics - animations. + longDescription = '' + The GNU plotutils package contains software for both programmers and + technical users. Its centerpiece is libplot, a powerful C/C++ + function library for exporting 2-D vector graphics in many file + formats, both vector and raster. It can also do vector graphics + animations. - libplot is device-independent in the sense that its API (application - programming interface) does not depend on the type of graphics file - to be exported. + libplot is device-independent in the sense that its API (application + programming interface) does not depend on the type of graphics file + to be exported. - Besides libplot, the package contains command-line programs for - plotting scientific data. Many of them use libplot to export - graphics. - ''; + Besides libplot, the package contains command-line programs for + plotting scientific data. Many of them use libplot to export + graphics. + ''; homepage = "https://www.gnu.org/software/plotutils/"; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 71a8fbdd7fed..2f3a644898ae 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -46,14 +46,15 @@ stdenv.mkDerivation (finalAttrs: { # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out - postPatch = '' cd unix - ./prebuild.sh - cd .. - sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in} - sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in} - sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in} - sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} - ''; + postPatch = '' + cd unix + ./prebuild.sh + cd .. + sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in} + sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in} + sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in} + sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} + ''; configureFlags = [ "COMPILED_BY=NixOS" diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index f070b028f654..d5d99f080ebf 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.10.0"; + version = "2024.10.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EdxCq/123OJm63NBfGnt5pfqdUXPti+NmbSVRu/gwqc="; + hash = "sha256-tnyuxDlrq5zeXCnHxvBQm3VEpnYL/7308Jrjq8IZ4Uc="; }; build-systems = with python.pkgs; [ diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 67bb98474c9a..b5998456798d 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -97,8 +97,8 @@ stdenv.mkDerivation rec { separateDebugInfo = !xenSupport; - preConfigure = - '' for i in "tests/util/"*.in + preConfigure = '' + for i in "tests/util/"*.in do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' done @@ -184,17 +184,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU GRUB, the Grand Unified Boot Loader"; - longDescription = - '' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand - Unified Bootloader, which was originally designed and implemented by - Erich Stefan Boleyn. + longDescription = '' + GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand + Unified Bootloader, which was originally designed and implemented by + Erich Stefan Boleyn. - Briefly, the boot loader is the first software program that runs when a - computer starts. It is responsible for loading and transferring - control to the operating system kernel software (such as the Hurd or - the Linux). The kernel, in turn, initializes the rest of the - operating system (e.g., GNU). - ''; + Briefly, the boot loader is the first software program that runs when a + computer starts. It is responsible for loading and transferring + control to the operating system kernel software (such as the Hurd or + the Linux). The kernel, in turn, initializes the rest of the + operating system (e.g., GNU). + ''; homepage = "https://www.gnu.org/software/grub/"; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index b6883e570802..20c54ec2cb96 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PvGrub image for use for booting PV Xen guests"; - longDescription = - '' This package provides a PvGrub image for booting Para-Virtualized (PV) + longDescription = '' + This package provides a PvGrub image for booting Para-Virtualized (PV) Xen guests ''; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 00e8b333a42e..a5c49ca7c082 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -32,23 +32,23 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Shell tool for executing jobs in parallel"; - longDescription = - '' GNU Parallel is a shell tool for executing jobs in parallel. A job - is typically a single command or a small script that has to be run - for each of the lines in the input. The typical input is a list of - files, a list of hosts, a list of users, or a list of tables. + longDescription = '' + GNU Parallel is a shell tool for executing jobs in parallel. A job + is typically a single command or a small script that has to be run + for each of the lines in the input. The typical input is a list of + files, a list of hosts, a list of users, or a list of tables. - If you use xargs today you will find GNU Parallel very easy to use. - If you write loops in shell, you will find GNU Parallel may be able - to replace most of the loops and make them run faster by running - jobs in parallel. If you use ppss or pexec you will find GNU - Parallel will often make the command easier to read. + If you use xargs today you will find GNU Parallel very easy to use. + If you write loops in shell, you will find GNU Parallel may be able + to replace most of the loops and make them run faster by running + jobs in parallel. If you use ppss or pexec you will find GNU + Parallel will often make the command easier to read. - GNU Parallel makes sure output from the commands is the same output - as you would get had you run the commands sequentially. This makes - it possible to use output from GNU Parallel as input for other - programs. - ''; + GNU Parallel makes sure output from the commands is the same output + as you would get had you run the commands sequentially. This makes + it possible to use output from GNU Parallel as input for other + programs. + ''; homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index e952fa6f253c..68487255d9bc 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -41,27 +41,27 @@ stdenv.mkDerivation rec { description = "Window manager that multiplexes a physical terminal"; license = licenses.gpl3Plus; - longDescription = - '' GNU Screen is a full-screen window manager that multiplexes a physical - terminal between several processes, typically interactive shells. - Each virtual terminal provides the functions of the DEC VT100 - terminal and, in addition, several control functions from the ANSI - X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line - and support for multiple character sets). There is a scrollback - history buffer for each virtual terminal and a copy-and-paste - mechanism that allows the user to move text regions between windows. - When screen is called, it creates a single window with a shell in it - (or the specified command) and then gets out of your way so that you - can use the program as you normally would. Then, at any time, you - can create new (full-screen) windows with other programs in them - (including more shells), kill the current window, view a list of the - active windows, turn output logging on and off, copy text between - windows, view the scrollback history, switch between windows, etc. - All windows run their programs completely independent of each other. - Programs continue to run when their window is currently not visible - and even when the whole screen session is detached from the users - terminal. - ''; + longDescription = '' + GNU Screen is a full-screen window manager that multiplexes a physical + terminal between several processes, typically interactive shells. + Each virtual terminal provides the functions of the DEC VT100 + terminal and, in addition, several control functions from the ANSI + X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line + and support for multiple character sets). There is a scrollback + history buffer for each virtual terminal and a copy-and-paste + mechanism that allows the user to move text regions between windows. + When screen is called, it creates a single window with a shell in it + (or the specified command) and then gets out of your way so that you + can use the program as you normally would. Then, at any time, you + can create new (full-screen) windows with other programs in them + (including more shells), kill the current window, view a list of the + active windows, turn output logging on and off, copy text between + windows, view the scrollback history, switch between windows, etc. + All windows run their programs completely independent of each other. + Programs continue to run when their window is currently not visible + and even when the whole screen session is detached from the users + terminal. + ''; platforms = platforms.unix; maintainers = [ ]; diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/tools/misc/statserial/default.nix index 86736a86386e..129cf9ad504c 100644 --- a/pkgs/tools/misc/statserial/default.nix +++ b/pkgs/tools/misc/statserial/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { description = "Display serial port modem status lines"; license = licenses.gpl2Plus; - longDescription = - '' Statserial displays a table of the signals on a standard 9-pin or + longDescription = '' + Statserial displays a table of the signals on a standard 9-pin or 25-pin serial port, and indicates the status of the handshaking lines. It can be useful for debugging problems with serial ports or modems. - ''; + ''; platforms = platforms.unix; maintainers = with maintainers; [ rps ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 8c2e3a9b7949..b70476166fc2 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -39,6 +39,10 @@ ./patches/0002-reintroduce-tlp-sleep-service.patch ]; + postPatch = '' + substituteInPlace Makefile --replace-fail ' ?= /usr/' ' ?= /' + ''; + buildInputs = [ perl ]; nativeBuildInputs = [ makeWrapper ]; @@ -55,16 +59,6 @@ "TLP_WITH_SYSTEMD=1" "DESTDIR=${placeholder "out"}" - "TLP_BATD=/share/tlp/bat.d" - "TLP_BIN=/bin" - "TLP_CONFDEF=/share/tlp/defaults.conf" - "TLP_CONFREN=/share/tlp/rename.conf" - "TLP_FLIB=/share/tlp/func.d" - "TLP_MAN=/share/man" - "TLP_META=/share/metainfo" - "TLP_SBIN=/sbin" - "TLP_SHCPL=/share/bash-completion/completions" - "TLP_TLIB=/share/tlp" ]; installTargets = [ "install-tlp" "install-man" ] diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 325ad135558c..35bc7a272100 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: { description = "Unix-unix cp over serial line, also includes cu program"; mainProgram = "uucp"; - longDescription = - '' Taylor UUCP is a free implementation of UUCP and is the standard - UUCP used on the GNU system. If you don't know what UUCP is chances - are, nowadays, that you won't need it. If you do need it, you've - just found one of the finest UUCP implementations available. - ''; + longDescription = '' + Taylor UUCP is a free implementation of UUCP and is the standard + UUCP used on the GNU system. If you don't know what UUCP is chances + are, nowadays, that you won't need it. If you do need it, you've + just found one of the finest UUCP implementations available. + ''; homepage = "https://www.gnu.org/software/uucp/uucp.html"; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index d7a5d8431210..015e4f8be028 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -248,9 +248,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "apache-avro" @@ -381,9 +381,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "998282f8f49ccd6116b0ed8a4de0fbd3151697920e7c7533416d6e25e76434a7" dependencies = [ "brotli", "flate2", @@ -404,7 +404,7 @@ dependencies = [ "async-lock 2.8.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-lite", "slab", ] @@ -459,12 +459,12 @@ dependencies = [ "async-stream", "async-trait", "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "fnv", "futures-util", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "mime", "multer", "num-traits", @@ -487,11 +487,11 @@ dependencies = [ "Inflector", "async-graphql-parser", "darling 0.20.8", - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.86", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", "quote 1.0.37", "strum 0.26.2", - "syn 2.0.75", + "syn 2.0.79", "thiserror", ] @@ -513,8 +513,8 @@ version = "7.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69117c43c01d81a69890a9f5dd6235f2f027ca8d1ec62d6d3c5e01ca0edb4f2b" dependencies = [ - "bytes 1.7.1", - "indexmap 2.5.0", + "bytes 1.7.2", + "indexmap 2.6.0", "serde", "serde_json", ] @@ -565,7 +565,7 @@ dependencies = [ "futures-lite", "parking", "polling 3.3.0", - "rustix 0.38.31", + "rustix 0.38.37", "slab", "tracing 0.1.40", "waker-fn", @@ -599,8 +599,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "http 0.2.9", "memchr", "nkeys 0.3.2", @@ -650,7 +650,7 @@ dependencies = [ "cfg-if", "event-listener 3.0.1", "futures-lite", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.48.0", ] @@ -672,9 +672,9 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -689,7 +689,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix 0.38.37", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -697,9 +697,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -708,13 +708,13 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -725,13 +725,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -765,8 +765,8 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "hex", "http 0.2.9", "hyper 0.14.28", @@ -798,7 +798,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "http-body 0.4.5", "pin-project-lite", @@ -820,7 +820,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "fastrand 2.0.1", + "fastrand 2.1.1", "http 0.2.9", "percent-encoding", "tracing 0.1.40", @@ -866,8 +866,8 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -889,7 +889,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -911,7 +911,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -933,7 +933,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -959,7 +959,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "http-body 0.4.5", "once_cell", @@ -985,8 +985,8 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1031,7 +1031,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1053,7 +1053,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1075,7 +1075,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1106,16 +1106,16 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" +checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "form_urlencoded", "hex", "hmac", @@ -1147,7 +1147,7 @@ checksum = "c5a373ec01aede3dd066ec018c1bc4e8f5dd11b2c11c59c8eef1a5c68101f397" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32c", "crc32fast", "hex", @@ -1162,25 +1162,25 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.4" +version = "0.60.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" +checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90" dependencies = [ "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32fast", ] [[package]] name = "aws-smithy-http" -version = "0.60.10" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01dbcb6e2588fd64cfb6d7529661b06466419e4c54ed1c62d6510d2d0350a728" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", "futures-core", "http 0.2.9", @@ -1213,16 +1213,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" +checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", @@ -1246,7 +1246,7 @@ checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "http 1.1.0", "pin-project-lite", @@ -1257,13 +1257,14 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.4" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "273dcdfd762fae3e1650b8024624e7cd50e484e37abdab73a7a706188ad34543" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", + "futures-core", "http 0.2.9", "http 1.1.0", "http-body 0.4.5", @@ -1276,6 +1277,8 @@ dependencies = [ "ryu", "serde", "time", + "tokio", + "tokio-util", ] [[package]] @@ -1297,7 +1300,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "tracing 0.1.40", ] @@ -1308,9 +1311,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1323,13 +1326,40 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tower", "tower-layer", "tower-service", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core 0.4.5", + "bytes 1.7.2", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -1337,7 +1367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1347,6 +1377,26 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes 1.7.2", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", +] + [[package]] name = "azure_core" version = "0.17.0" @@ -1355,9 +1405,9 @@ checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f" dependencies = [ "async-trait", "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "dyn-clone", - "futures 0.3.30", + "futures 0.3.31", "getrandom 0.2.15", "http-types", "log", @@ -1366,7 +1416,7 @@ dependencies = [ "quick-xml", "rand 0.8.5", "reqwest 0.11.26", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "serde", "serde_json", "time", @@ -1383,7 +1433,7 @@ dependencies = [ "async-lock 3.4.0", "async-trait", "azure_core", - "futures 0.3.30", + "futures 0.3.31", "log", "oauth2", "pin-project", @@ -1404,8 +1454,8 @@ dependencies = [ "RustyXML", "async-trait", "azure_core", - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "hmac", "log", "serde", @@ -1426,8 +1476,8 @@ dependencies = [ "RustyXML", "azure_core", "azure_storage", - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "log", "serde", "serde_derive", @@ -1567,7 +1617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -1609,7 +1659,7 @@ dependencies = [ "async-channel", "async-lock 2.8.0", "async-task", - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-io", "futures-lite", "piper", @@ -1633,7 +1683,7 @@ checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" dependencies = [ "base64 0.22.1", "bollard-stubs", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "futures-core", "futures-util", @@ -1641,7 +1691,7 @@ dependencies = [ "home", "http 1.1.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-named-pipe", "hyper-rustls 0.26.0", "hyper-util", @@ -1674,7 +1724,7 @@ dependencies = [ "chrono", "serde", "serde_repr", - "serde_with 3.9.0", + "serde_with 3.11.0", ] [[package]] @@ -1695,17 +1745,17 @@ checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ "once_cell", "proc-macro-crate 2.0.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", "syn_derive", ] [[package]] name = "brotli" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1761,7 +1811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.4", + "regex-automata 0.4.8", "serde", ] @@ -1788,7 +1838,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -1817,9 +1867,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" dependencies = [ "serde", ] @@ -1830,7 +1880,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "either", ] @@ -1841,13 +1891,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] -name = "cargo_toml" -version = "0.20.4" +name = "cargo-lock" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ + "semver 1.0.23", "serde", - "toml", + "toml 0.7.8", + "url", ] [[package]] @@ -1968,9 +2020,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6" dependencies = [ "chrono", "chrono-tz-build", @@ -1980,12 +2032,11 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7" dependencies = [ "parse-zoneinfo", - "phf", "phf_codegen", ] @@ -2022,19 +2073,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d18b093eba54c9aaa1e3784d4361eb2ba944cf7d0a932a830132238f483e8d8" -[[package]] -name = "cidr-utils" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" -dependencies = [ - "debug-helper", - "num-bigint", - "num-traits", - "once_cell", - "regex", -] - [[package]] name = "cidr-utils" version = "0.6.1" @@ -2059,9 +2097,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -2069,9 +2107,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53" +checksum = "e099138e1807662ff75e2cebe4ae2287add879245574489f9b1588eb5e5564ed" dependencies = [ "clap", "log", @@ -2079,9 +2117,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -2092,23 +2130,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.24" +version = "4.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" +checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2140,17 +2178,16 @@ name = "codecs" version = "0.1.0" dependencies = [ "apache-avro", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "csv-core", "derivative", "dyn-clone", - "futures 0.3.30", + "futures 0.3.31", "indoc", "influxdb-line-protocol", "memchr", - "once_cell", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "prost 0.12.6", "prost-reflect", "regex", @@ -2219,7 +2256,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "memchr", "pin-project-lite", @@ -2229,9 +2266,9 @@ dependencies = [ [[package]] name = "community-id" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6af96839c04974cf381e427792a99913ecf3f7bfb348f153dc8a8e5f9803ad" +checksum = "9c9e701443040497976ce85ba641ef0c4a6b319307b9d93718fc76bb77540bff" dependencies = [ "anyhow", "base64 0.21.7", @@ -2272,7 +2309,7 @@ dependencies = [ "directories", "serde", "thiserror", - "toml", + "toml 0.8.19", ] [[package]] @@ -2290,22 +2327,22 @@ dependencies = [ [[package]] name = "console-api" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" dependencies = [ "futures-core", - "prost 0.12.6", - "prost-types 0.12.6", - "tonic", + "prost 0.13.3", + "prost-types 0.13.3", + "tonic 0.12.3", "tracing-core 0.1.32", ] [[package]] name = "console-subscriber" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" dependencies = [ "console-api", "crossbeam-channel", @@ -2313,14 +2350,15 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost 0.12.6", - "prost-types 0.12.6", + "hyper-util", + "prost 0.13.3", + "prost-types 0.13.3", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.3", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -2414,7 +2452,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" dependencies = [ - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -2437,7 +2475,7 @@ dependencies = [ "ciborium", "clap", "criterion-plot", - "futures 0.3.30", + "futures 0.3.31", "is-terminal", "itertools 0.10.5", "num-traits", @@ -2521,7 +2559,6 @@ checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ "bitflags 2.4.1", "crossterm_winapi", - "futures-core", "libc", "mio 0.8.11", "parking_lot", @@ -2530,6 +2567,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.4.1", + "crossterm_winapi", + "futures-core", + "mio 1.0.1", + "parking_lot", + "rustix 0.38.37", + "signal-hook", + "signal-hook-mio", + "winapi", +] + [[package]] name = "crossterm_winapi" version = "0.9.1" @@ -2639,7 +2693,7 @@ dependencies = [ "curve25519-dalek-derive", "digest", "fiat-crypto", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -2650,9 +2704,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2683,7 +2737,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "strsim 0.10.0", "syn 1.0.109", @@ -2697,10 +2751,10 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "strsim 0.10.0", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2722,7 +2776,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2746,9 +2800,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -2772,9 +2826,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "databend-client" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a2fc159e8f2059610799425725cd4c3d3e27e472892107693c1fd80ba47e61" +checksum = "88ca151573bc75cb433d69083e7c4b33287044506de785901b1670cf1d8cd4a2" dependencies = [ "async-trait", "log", @@ -2815,12 +2869,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - [[package]] name = "der" version = "0.7.8" @@ -2848,7 +2896,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -2859,9 +2907,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2880,9 +2928,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2892,7 +2940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2902,9 +2950,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "syn 1.0.109", ] @@ -3022,7 +3070,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eefe29e8dd614abbee51a1616654cab123c4c56850ab83f5b7f1e1f9977bf7c" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "moka", "octseq", @@ -3177,7 +3225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -3189,9 +3237,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -3201,9 +3249,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -3221,9 +3269,9 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -3385,6 +3433,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -3396,9 +3455,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -3421,15 +3480,15 @@ name = "file-source" version = "0.1.0" dependencies = [ "bstr 1.10.0", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "criterion", - "dashmap 6.0.1", + "dashmap 6.1.0", "flate2", - "futures 0.3.30", + "futures 0.3.31", "glob", - "indexmap 2.5.0", + "indexmap 2.6.0", "libc", "quickcheck", "scan_fmt", @@ -3477,9 +3536,9 @@ checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -3517,6 +3576,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3574,9 +3639,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -3589,9 +3654,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -3599,15 +3664,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -3616,9 +3681,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -3637,38 +3702,38 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures 0.1.31", "futures-channel", @@ -3751,7 +3816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d351469a584f3b3565e2e740d4da60839bddc4320dadd7d61da8bdd77ffb373b" dependencies = [ "arc-swap", - "futures 0.3.30", + "futures 0.3.31", "log", "reqwest 0.11.26", "serde", @@ -3771,7 +3836,7 @@ checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ "cfg-if", "dashmap 5.5.3", - "futures 0.3.30", + "futures 0.3.31", "futures-timer", "no-std-compat", "nonzero_ext", @@ -3822,7 +3887,7 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "serde", "serde_json", @@ -3836,7 +3901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "syn 1.0.109", ] @@ -3850,7 +3915,7 @@ dependencies = [ "serde_json", "strum 0.25.0", "strum_macros 0.25.3", - "tonic", + "tonic 0.11.0", "tonic-build 0.11.0", ] @@ -3862,7 +3927,7 @@ dependencies = [ "dashmap 5.5.3", "derive_builder", "enum_dispatch", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "greptime-proto", "parking_lot", @@ -3871,7 +3936,7 @@ dependencies = [ "snafu 0.7.5", "tokio", "tokio-stream", - "tonic", + "tonic 0.11.0", "tonic-build 0.9.2", "tower", ] @@ -3903,13 +3968,13 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "futures-core", "futures-sink", "futures-util", "http 0.2.9", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3923,12 +3988,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3972,7 +4037,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -3996,7 +4071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "headers-core", "http 0.2.9", "httpdate", @@ -4063,7 +4138,7 @@ version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "cfg-if", - "futures 0.3.30", + "futures 0.3.31", "glob", "heim-common", "heim-runtime", @@ -4143,7 +4218,7 @@ name = "heim-runtime" version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "futures-timer", "once_cell", "smol", @@ -4240,7 +4315,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -4251,7 +4326,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -4262,7 +4337,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "pin-project-lite", ] @@ -4273,7 +4348,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 1.1.0", ] @@ -4283,7 +4358,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 1.1.0", "http-body 1.0.0", @@ -4350,7 +4425,7 @@ version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-core", "futures-util", @@ -4370,11 +4445,11 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "h2 0.4.6", @@ -4396,7 +4471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "pin-project-lite", "tokio", @@ -4428,8 +4503,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "headers", "http 0.2.9", "hyper 0.14.28", @@ -4463,7 +4538,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "log", "rustls 0.22.4", @@ -4486,13 +4561,26 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "hyper 0.14.28", "native-tls", "tokio", @@ -4501,20 +4589,19 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.2.0", + "hyper 1.4.1", "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing 0.1.40", ] @@ -4527,7 +4614,7 @@ checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc" dependencies = [ "hex", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "pin-project-lite", "tokio", @@ -4617,12 +4704,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -4664,7 +4751,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22fa7ee6be451ea0b1912b962c91c8380835e97cf1584a77e18264e908448dcb" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "log", "nom", "smallvec", @@ -4750,9 +4837,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" dependencies = [ "serde", ] @@ -4773,15 +4860,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "is_ci" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] name = "itertools" @@ -4893,7 +4980,7 @@ name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ "env_logger 0.11.5", - "futures 0.3.30", + "futures 0.3.31", "indoc", "k8s-openapi 0.16.0", "k8s-test-framework", @@ -4912,7 +4999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "serde", "serde-value", @@ -4926,7 +5013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "http 0.2.9", "percent-encoding", @@ -5004,16 +5091,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13" dependencies = [ "base64 0.20.0", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "dirs-next", "either", - "futures 0.3.30", + "futures 0.3.31", "http 0.2.9", "http-body 0.4.5", "hyper 0.14.28", "hyper-openssl", - "hyper-timeout", + "hyper-timeout 0.4.1", "jsonpath_lib", "k8s-openapi 0.18.0", "kube-core", @@ -5059,7 +5146,7 @@ dependencies = [ "async-trait", "backoff", "derivative", - "futures 0.3.30", + "futures 0.3.31", "json-patch", "k8s-openapi 0.18.0", "kube-client", @@ -5108,7 +5195,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "108dc8f5dabad92c65a03523055577d847f5dcc00f3e7d3a68bc4d48e01d8fe1" dependencies = [ - "regex-automata 0.4.4", + "regex-automata 0.4.8", ] [[package]] @@ -5144,9 +5231,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libflate" @@ -5213,9 +5300,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "listenfd" @@ -5260,7 +5347,7 @@ checksum = "879777f0cc6f3646a044de60e4ab98c75617e3f9580f7a2032e6ad7ea0cd3054" name = "loki-logproto" version = "0.1.0" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "prost 0.12.6", "prost-build 0.12.6", @@ -5270,11 +5357,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -5416,9 +5503,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -5452,9 +5539,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" +checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" dependencies = [ "ahash 0.8.11", "portable-atomic", @@ -5462,11 +5549,11 @@ dependencies = [ [[package]] name = "metrics-tracing-context" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb791d015f8947acf5a7f62bd28d00f289bb7ea98cfbe3ffec1d061eee12df12" +checksum = "62a6a1f7141f1d9bc7a886b87536bbfc97752e08b369e1e0453a9acfab5f5da4" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "lockfree-object-pool", "metrics", @@ -5479,18 +5566,18 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" +checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" dependencies = [ "aho-corasick", "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "metrics", "num_cpus", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "quanta", "radix_trie", "sketches-ddsketch", @@ -5556,6 +5643,7 @@ checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ "hermit-abi", "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -5596,10 +5684,10 @@ dependencies = [ "itertools 0.12.1", "once_cell", "proc-macro-error", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "regex", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -5624,7 +5712,7 @@ dependencies = [ "once_cell", "parking_lot", "quanta", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "smallvec", "tagptr", "thiserror", @@ -5685,7 +5773,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "encoding_rs", "futures-util", "http 1.1.0", @@ -5742,7 +5830,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ebbe97acce52d06aebed4cd4a87c0941f4b2519b59b82b4feb5bd0ce003dfd" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "ndarray", "noisy_float", @@ -5827,9 +5915,9 @@ dependencies = [ [[package]] name = "nkeys" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de02c883c178998da8d0c9816a88ef7ef5c58314dd1585c97a4a5679f3ab337" +checksum = "9f49e787f4c61cbd0f9320b31cc26e58719f6aa5068e34697dd3aea361412fe3" dependencies = [ "data-encoding", "ed25519", @@ -5842,11 +5930,11 @@ dependencies = [ [[package]] name = "no-proxy" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b41e7479dc3678ea792431e04bafd62a31879035f4a5fa707602df062f58c77" +checksum = "6d688d11967f7f52e273fb8f8f07ecb094254fed630e22a0cab60cc98047a5db" dependencies = [ - "cidr-utils 0.5.11", + "cidr-utils", "serde", ] @@ -6066,7 +6154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -6078,9 +6166,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6089,10 +6177,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.86", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6154,7 +6242,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ed2eaec452d98ccc1c615dd843fd039d9445f2fb4da114ee7e6af5fcb68be98" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "serde", "smallvec", ] @@ -6170,9 +6258,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "onig" @@ -6218,10 +6306,10 @@ dependencies = [ "async-trait", "backon", "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "flagset", - "futures 0.3.30", + "futures 0.3.31", "getrandom 0.2.15", "http 0.2.9", "log", @@ -6261,7 +6349,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_plain", - "serde_with 3.9.0", + "serde_with 3.11.0", "sha2", "subtle", "thiserror", @@ -6289,9 +6377,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6326,13 +6414,13 @@ dependencies = [ name = "opentelemetry-proto" version = "0.1.0" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "hex", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "prost 0.12.6", "prost-build 0.12.6", - "tonic", + "tonic 0.11.0", "tonic-build 0.11.0", "vector-core", "vector-lookup", @@ -6356,9 +6444,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" +checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" dependencies = [ "num-traits", ] @@ -6403,11 +6491,12 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "owo-colors" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" +checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" dependencies = [ - "supports-color", + "supports-color 2.1.0", + "supports-color 3.0.1", ] [[package]] @@ -6571,9 +6660,9 @@ checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6594,7 +6683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] @@ -6646,22 +6735,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6695,7 +6784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-io", ] @@ -6785,7 +6874,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.31", + "rustix 0.38.37", "tracing 0.1.40", "windows-sys 0.48.0", ] @@ -6829,7 +6918,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de0ea6504e07ca78355a6fb88ad0f36cafe9e696cbc6717f16a207f3a60be72" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "openssl", "tokio", "tokio-openssl", @@ -6844,7 +6933,7 @@ checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ "base64 0.22.1", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "fallible-iterator", "hmac", "md-5", @@ -6856,11 +6945,11 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" +checksum = "f66ea23a2d0e5734297357705193335e0a957696f34bed2f2faefacb2fec336f" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "fallible-iterator", "postgres-protocol", @@ -6929,7 +7018,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "syn 1.0.109", ] @@ -6939,8 +7028,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.86", - "syn 2.0.75", + "proc-macro2 1.0.87", + "syn 2.0.79", ] [[package]] @@ -6987,11 +7076,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -7001,7 +7090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", "version_check", @@ -7013,7 +7102,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "version_check", ] @@ -7041,9 +7130,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -7052,7 +7141,7 @@ dependencies = [ name = "prometheus-parser" version = "0.1.0" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "nom", "num_enum 0.7.3", "prost 0.12.6", @@ -7076,7 +7165,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -7088,7 +7177,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7099,7 +7188,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost-derive 0.11.9", ] @@ -7109,18 +7198,18 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost-derive 0.12.6", ] [[package]] name = "prost" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ - "bytes 1.7.1", - "prost-derive 0.13.1", + "bytes 1.7.2", + "prost-derive 0.13.3", ] [[package]] @@ -7129,7 +7218,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "heck 0.4.1", "itertools 0.10.5", "lazy_static", @@ -7151,7 +7240,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "heck 0.5.0", "itertools 0.12.1", "log", @@ -7162,7 +7251,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.75", + "syn 2.0.79", "tempfile", ] @@ -7174,7 +7263,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7187,34 +7276,34 @@ checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "prost-derive" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools 0.13.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "prost-reflect" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a6a9143ae25c25fa7b6a48d6cc08b10785372060009c25140a4e7c340e95af" +checksum = "4b7535b02f0e5efe3e1dbfcb428be152226ed0c66cad9541f2274c8ba8d4cd40" dependencies = [ "base64 0.22.1", "once_cell", - "prost 0.13.1", - "prost-types 0.13.1", + "prost 0.13.3", + "prost-types 0.13.3", "serde", "serde-value", ] @@ -7239,11 +7328,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.13.1", + "prost 0.13.3", ] [[package]] @@ -7276,7 +7365,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7299,12 +7388,12 @@ checksum = "d7f3541ff84e39da334979ac4bf171e0f277f4f782603aeae65bf5795dc7275a" dependencies = [ "async-trait", "bit-vec", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "data-url", "flate2", - "futures 0.3.30", + "futures 0.3.31", "futures-io", "futures-timer", "log", @@ -7384,7 +7473,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7404,7 +7493,7 @@ version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", ] [[package]] @@ -7528,7 +7617,7 @@ dependencies = [ "bitflags 2.4.1", "cassowary", "compact_str", - "crossterm", + "crossterm 0.27.0", "itertools 0.13.0", "lru", "paste", @@ -7635,9 +7724,9 @@ checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ "arc-swap", "async-trait", - "bytes 1.7.1", + "bytes 1.7.2", "combine 4.6.6", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "itoa", "native-tls", @@ -7691,14 +7780,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", - "regex-syntax 0.8.2", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -7712,13 +7801,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.5", ] [[package]] @@ -7741,15 +7830,15 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" -version = "1.9.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "rend" @@ -7767,7 +7856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "encoding_rs", "futures-core", "futures-util", @@ -7790,7 +7879,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -7813,13 +7902,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-rustls 0.26.0", "hyper-util", "ipnet", @@ -7836,7 +7925,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tokio-rustls 0.25.0", "tokio-util", @@ -7892,7 +7981,7 @@ checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", - "bytes 1.7.1", + "bytes 1.7.2", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -7908,7 +7997,7 @@ version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7991,31 +8080,31 @@ dependencies = [ [[package]] name = "rstest" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" +checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "futures-timer", "rstest_macros", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] name = "rstest_macros" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" +checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" dependencies = [ "cfg-if", "glob", - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.86", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", "quote 1.0.37", "regex", "relative-path", - "rustc_version 0.4.0", - "syn 2.0.75", + "rustc_version 0.4.1", + "syn 2.0.79", "unicode-ident", ] @@ -8025,7 +8114,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1568e15fab2d546f940ed3a21f48bbbd1c494c90c99c4481339364a497f94a9" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "flume 0.11.0", "futures-util", "log", @@ -8045,7 +8134,7 @@ checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", - "bytes 1.7.1", + "bytes 1.7.2", "num-traits", "rand 0.8.5", "rkyv", @@ -8076,9 +8165,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -8109,14 +8198,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -8302,11 +8391,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8410,9 +8499,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -8423,7 +8512,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93b4e415d6bff989e5e48649ca9b8b4d4997cb069a0c90a84bfd38c7df5e3968" dependencies = [ - "toml", + "toml 0.8.19", ] [[package]] @@ -8458,13 +8547,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8473,18 +8562,18 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -8536,9 +8625,9 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8574,19 +8663,19 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", - "serde_with_macros 3.9.0", + "serde_with_macros 3.11.0", "time", ] @@ -8597,21 +8686,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8632,7 +8721,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -8713,12 +8802,13 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", "mio 0.8.11", + "mio 1.0.1", "signal-hook", ] @@ -8771,9 +8861,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" +checksum = "cfe85670573cd6f0fa97940f26e7e6601213c3b0555246c24234131f88c5709e" dependencies = [ "console", "similar", @@ -8876,7 +8966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -8888,9 +8978,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8960,7 +9050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9053,10 +9143,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "rustversion", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9066,10 +9156,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "rustversion", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9088,6 +9178,15 @@ dependencies = [ "is_ci", ] +[[package]] +name = "supports-color" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" +dependencies = [ + "is_ci", +] + [[package]] name = "syn" version = "0.15.44" @@ -9105,18 +9204,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.75" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "unicode-ident", ] @@ -9128,9 +9227,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9139,6 +9238,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "syslog" version = "6.1.1" @@ -9214,20 +9319,20 @@ dependencies = [ [[package]] name = "temp-dir" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" +checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.0.1", + "fastrand 2.1.1", "once_cell", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.59.0", ] @@ -9253,12 +9358,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ - "rustix 0.38.31", - "windows-sys 0.48.0", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -9281,22 +9386,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9404,7 +9509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "bytes 1.7.1", + "bytes 1.7.2", "libc", "mio 1.0.1", "parking_lot", @@ -9443,9 +9548,9 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9460,11 +9565,10 @@ dependencies = [ [[package]] name = "tokio-openssl" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" +checksum = "59df6849caa43bb7567f9a36f863c447d95a11d5903c9cc334ba32576a27eadd" dependencies = [ - "futures-util", "openssl", "openssl-sys", "tokio", @@ -9472,13 +9576,13 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" +checksum = "3b5d3742945bc7d7f210693b0c58ae542c6fd47b17adbbda0885f3dcb34a6bdb" dependencies = [ "async-trait", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "fallible-iterator", "futures-channel", "futures-util", @@ -9530,9 +9634,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -9547,7 +9651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "tokio", "tokio-stream", @@ -9583,7 +9687,7 @@ name = "tokio-util" version = "0.7.11" source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.11-framed-read-continue-on-error#156dcaacdfa53f530a39eb91b1ceb731a9908986" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-io", "futures-sink", @@ -9592,6 +9696,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + [[package]] name = "toml" version = "0.8.19" @@ -9619,7 +9735,9 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", + "serde", + "serde_spanned", "toml_datetime", "winnow 0.5.18", ] @@ -9630,18 +9748,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.5.0", - "toml_datetime", - "winnow 0.5.18", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.18", ] @@ -9652,7 +9759,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -9667,15 +9774,15 @@ checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "flate2", "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", "hyper 0.14.28", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost 0.12.6", @@ -9692,6 +9799,36 @@ dependencies = [ "zstd 0.12.4", ] +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.5", + "base64 0.22.1", + "bytes 1.7.2", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.1", + "hyper-timeout 0.5.1", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.3", + "socket2 0.5.7", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.40", +] + [[package]] name = "tonic-build" version = "0.9.2" @@ -9699,7 +9836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "prost-build 0.11.9", "quote 1.0.37", "syn 1.0.109", @@ -9712,10 +9849,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease 0.2.15", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "prost-build 0.12.6", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9747,7 +9884,7 @@ dependencies = [ "async-compression", "base64 0.21.7", "bitflags 2.4.1", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 0.2.9", @@ -9816,9 +9953,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9856,7 +9993,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "futures-task", "pin-project", "tracing 0.1.40", @@ -9876,7 +10013,7 @@ name = "tracing-limit" version = "0.1.0" dependencies = [ "criterion", - "dashmap 6.0.1", + "dashmap 6.1.0", "mock_instant", "tracing 0.1.40", "tracing-core 0.1.32", @@ -9929,7 +10066,7 @@ name = "tracing-tower" version = "0.1.0" source = "git+https://github.com/tokio-rs/tracing?rev=e0642d949891546a3bb7e47080365ee7274f05cd#e0642d949891546a3bb7e47080365ee7274f05cd" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "tower-service", "tracing 0.2.0", "tracing-futures 0.3.0", @@ -10008,7 +10145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 0.2.9", "httparse", @@ -10027,7 +10164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 1.1.0", "httparse", @@ -10055,7 +10192,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -10075,9 +10212,9 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -10105,9 +10242,9 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -10162,9 +10299,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -10325,13 +10462,12 @@ dependencies = [ "dunce", "glob", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "indicatif", "itertools 0.13.0", "log", - "once_cell", "os_info", - "owo-colors 4.0.0", + "owo-colors 4.1.0", "paste", "regex", "reqwest 0.11.26", @@ -10340,12 +10476,12 @@ dependencies = [ "serde_yaml 0.9.34+deprecated", "sha2", "tempfile", - "toml", + "toml 0.8.19", ] [[package]] name = "vector" -version = "0.41.1" +version = "0.42.0" dependencies = [ "apache-avro", "approx", @@ -10377,7 +10513,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "axum", + "axum 0.6.20", "azure_core", "azure_identity", "azure_storage", @@ -10385,16 +10521,16 @@ dependencies = [ "base64 0.22.1", "bloomy", "bollard", - "bytes 1.7.1", + "bytes 1.7.2", "bytesize", "chrono", "chrono-tz", - "cidr-utils 0.6.1", + "cidr-utils", "clap", "colored", "console-subscriber", "criterion", - "crossterm", + "crossterm 0.28.1", "csv", "databend-client", "derivative", @@ -10406,7 +10542,7 @@ dependencies = [ "exitcode", "fakedata", "flate2", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "glob", "goauth", @@ -10427,7 +10563,7 @@ dependencies = [ "hyper 0.14.28", "hyper-openssl", "hyper-proxy", - "indexmap 2.5.0", + "indexmap 2.6.0", "indoc", "infer 0.16.0", "inventory", @@ -10448,17 +10584,16 @@ dependencies = [ "mlua", "mongodb", "nix 0.26.2", - "nkeys 0.4.3", + "nkeys 0.4.4", "nom", "notify", "num-format", "number_prefix", - "once_cell", "opendal", "openssl", "openssl-probe", "openssl-src", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "paste", "percent-encoding", "pin-project", @@ -10490,7 +10625,7 @@ dependencies = [ "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 3.9.0", + "serde_with 3.11.0", "serde_yaml 0.9.34+deprecated", "similar-asserts", "smallvec", @@ -10511,8 +10646,8 @@ dependencies = [ "tokio-test", "tokio-tungstenite 0.20.1", "tokio-util", - "toml", - "tonic", + "toml 0.8.19", + "tonic 0.11.0", "tonic-build 0.11.0", "tower", "tower-http", @@ -10542,7 +10677,7 @@ dependencies = [ "anyhow", "chrono", "clap", - "futures 0.3.30", + "futures 0.3.31", "graphql_client", "indoc", "reqwest 0.11.26", @@ -10563,7 +10698,7 @@ dependencies = [ "async-stream", "async-trait", "bytecheck", - "bytes 1.7.1", + "bytes 1.7.2", "clap", "crc32fast", "criterion", @@ -10571,14 +10706,13 @@ dependencies = [ "crossbeam-utils", "derivative", "fslock", - "futures 0.3.30", + "futures 0.3.31", "hdrhistogram", "memmap2", "metrics", "metrics-tracing-context", "metrics-util", "num-traits", - "once_cell", "paste", "pin-project", "proptest", @@ -10606,16 +10740,16 @@ name = "vector-common" version = "0.1.0" dependencies = [ "async-stream", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "chrono-tz", "crossbeam-utils", "derivative", - "futures 0.3.30", - "indexmap 2.5.0", + "futures 0.3.31", + "indexmap 2.6.0", "metrics", "nom", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "paste", "pin-project", "quickcheck", @@ -10643,15 +10777,15 @@ dependencies = [ "chrono-tz", "encoding_rs", "http 0.2.9", - "indexmap 2.5.0", + "indexmap 2.6.0", "inventory", "no-proxy", "num-traits", "serde", "serde_json", - "serde_with 3.9.0", + "serde_with 3.11.0", "snafu 0.7.5", - "toml", + "toml 0.8.19", "tracing 0.1.40", "url", "vector-config-common", @@ -10666,12 +10800,11 @@ version = "0.1.0" dependencies = [ "convert_case 0.6.0", "darling 0.20.8", - "once_cell", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "serde", "serde_json", - "syn 2.0.75", + "syn 2.0.79", "tracing 0.1.40", ] @@ -10680,11 +10813,11 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "serde", "serde_derive_internals", - "syn 2.0.75", + "syn 2.0.79", "vector-config", "vector-config-common", ] @@ -10697,7 +10830,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "bitmask-enum", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "chrono-tz", "criterion", @@ -10709,12 +10842,12 @@ dependencies = [ "enumflags2", "env-test-util", "float_eq", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "headers", "http 0.2.9", "hyper-proxy", - "indexmap 2.5.0", + "indexmap 2.6.0", "ipnet", "metrics", "metrics-tracing-context", @@ -10724,9 +10857,8 @@ dependencies = [ "ndarray-stats", "no-proxy", "noisy_float", - "once_cell", "openssl", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "parking_lot", "pin-project", "proptest", @@ -10744,7 +10876,7 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 3.9.0", + "serde_with 3.11.0", "serde_yaml 0.9.34+deprecated", "similar-asserts", "smallvec", @@ -10755,8 +10887,8 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "toml", - "tonic", + "toml 0.8.19", + "tonic 0.11.0", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -10809,7 +10941,7 @@ name = "vector-stream" version = "0.1.0" dependencies = [ "async-stream", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "pin-project", "proptest", @@ -10831,7 +10963,7 @@ dependencies = [ "async-graphql", "chrono", "colored", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "glob", "portpicker", @@ -10890,7 +11022,7 @@ dependencies = [ name = "vector-vrl-web-playground" version = "0.1.0" dependencies = [ - "cargo_toml", + "cargo-lock", "enrichment", "getrandom 0.2.15", "gloo-utils", @@ -10915,9 +11047,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78418b391bfef6a37127f5d7283a46b2a23e19b676640841fcf334e40740d919" +checksum = "5c22ec61cbd43e563df185521f9a2fb2f42f6ab96604a574c82f6564049fb431" dependencies = [ "aes", "ansi_term", @@ -10925,7 +11057,7 @@ dependencies = [ "base16", "base62", "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "cbc", "cfb-mode", "cfg-if", @@ -10933,7 +11065,7 @@ dependencies = [ "charset", "chrono", "chrono-tz", - "cidr-utils 0.6.1", + "cidr-utils", "clap", "codespan-reporting", "community-id", @@ -10947,6 +11079,7 @@ dependencies = [ "domain", "dyn-clone", "exitcode", + "fancy-regex", "flate2", "grok", "hex", @@ -10954,7 +11087,7 @@ dependencies = [ "hostname 0.4.0", "iana-time-zone", "idna 0.5.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "indoc", "influxdb-line-protocol", "itertools 0.13.0", @@ -10966,7 +11099,7 @@ dependencies = [ "ofb", "once_cell", "onig", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "paste", "peeking_take_while", "percent-encoding", @@ -10974,7 +11107,7 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", - "prost 0.13.1", + "prost 0.13.3", "prost-reflect", "psl", "psl-types", @@ -11031,7 +11164,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", ] @@ -11075,7 +11208,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "headers", @@ -11117,9 +11250,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -11128,16 +11261,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -11155,9 +11288,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote 1.0.37", "wasm-bindgen-macro-support", @@ -11165,22 +11298,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-streams" @@ -11246,7 +11379,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix 0.38.37", ] [[package]] @@ -11258,7 +11391,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.48.0", ] @@ -11600,18 +11733,18 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" +checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "deadpool", - "futures 0.3.30", + "futures 0.3.31", "http 1.1.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "log", "once_cell", @@ -11671,16 +11804,16 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index e93603d044d1..e2282008ce8e 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -48,7 +48,7 @@ let pname = "vector"; - version = "0.41.1"; + version = "0.42.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-E6AVjxwXMDonqsAMcCpaZBEPCi9bVXUygG4PUOLh+ck="; + hash = "sha256-0DEEgaQf4/NIbmRQyTdEuj4bPTLX8gjAhv4r48wfNZs="; }; cargoLock = { @@ -101,7 +101,7 @@ rustPlatform.buildRustPackage { # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect. # Upstream is working on fixing this in https://github.com/vectordotdev/vector/pull/20949, but silencing the lint lets us build again until then. # TODO remove when upgrading Vector - RUSTFLAGS = "--allow unexpected_cfgs"; + RUSTFLAGS = "--allow dependency_on_unit_never_type_fallback --allow dead_code"; # Without this, we get SIGSEGV failure RUST_MIN_STACK = 33554432; diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index 8198b21e9094..a7c56226af82 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -25,16 +25,18 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Clients for ARGUS"; - longDescription = ''Clients for Audit Record Generation and - Utilization System (ARGUS). The Argus Project is focused on developing all - aspects of large scale network situtational awareness derived from - network activity audit. Argus, itself, is next-generation network - flow technology, processing packets, either on the wire or in - captures, into advanced network flow data. The data, its models, - formats, and attributes are designed to support Network - Operations, Performance and Security Management. If you need to - know what is going on in your network, right now or historically, - you will find Argus a useful tool. ''; + longDescription = '' + Clients for Audit Record Generation and + Utilization System (ARGUS). The Argus Project is focused on developing all + aspects of large scale network situtational awareness derived from + network activity audit. Argus, itself, is next-generation network + flow technology, processing packets, either on the wire or in + captures, into advanced network flow data. The data, its models, + formats, and attributes are designed to support Network + Operations, Performance and Security Management. If you need to + know what is going on in your network, right now or historically, + you will find Argus a useful tool. + ''; homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index bbb9d2201447..72f87e359c08 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -29,15 +29,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Audit Record Generation and Utilization System for networks"; - longDescription = ''The Argus Project is focused on developing all - aspects of large scale network situtational awareness derived from - network activity audit. Argus, itself, is next-generation network - flow technology, processing packets, either on the wire or in - captures, into advanced network flow data. The data, its models, - formats, and attributes are designed to support Network - Operations, Performance and Security Management. If you need to - know what is going on in your network, right now or historically, - you will find Argus a useful tool. ''; + longDescription = '' + The Argus Project is focused on developing all + aspects of large scale network situtational awareness derived from + network activity audit. Argus, itself, is next-generation network + flow technology, processing packets, either on the wire or in + captures, into advanced network flow data. The data, its models, + formats, and attributes are designed to support Network + Operations, Performance and Security Management. If you need to + know what is going on in your network, right now or historically, + you will find Argus a useful tool. + ''; homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index e9c89657f803..0a3a7ae351d0 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -103,8 +103,8 @@ in buildGoModule rec { cp -R $src/pkg/status/templates $out/share/datadog-agent wrapProgram "$out/bin/agent" \ - --set PYTHONPATH "$out/${python.sitePackages}"'' + lib.optionalString withSystemd '' \ - --prefix LD_LIBRARY_PATH : '' + lib.makeLibraryPath [ (lib.getLib systemd) rtloader ]; + --set PYTHONPATH "$out/${python.sitePackages}"'' + + lib.optionalString withSystemd " --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib systemd) rtloader ]}"; passthru.tests.version = testers.testVersion { package = datadog-agent; diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix index 533f21e0f5f2..797a347bb45f 100644 --- a/pkgs/tools/networking/fakeroute/default.nix +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3"; src = fetchurl { - url = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz"; + url = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz"; hash = "sha256-DoXGJm8vOlAD6ZuvVAt6bkgfahc8WgyYIXCrgqzfiWg="; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = '' Make your machine appears to be anywhere on the internet in a traceroute ''; - homepage = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute"; + homepage = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute"; license = licenses.bsd3; platforms = platforms.linux; mainProgram = "fakeroute"; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index 2829b3967f91..64915135dd8b 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Command-line RTMP client"; - longDescription = - '' flvstreamer is an open source command-line RTMP client intended to + longDescription = '' + flvstreamer is an open source command-line RTMP client intended to stream audio or video content from all types of flash or rtmp servers. ''; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 6aedb474c612..a8638df3914a 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -76,12 +76,12 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of common network programs"; - longDescription = - '' The GNU network utilities suite provides the - following tools: ftp(d), hostname, ifconfig, inetd, logger, ping, rcp, - rexec(d), rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d), - traceroute, uucpd, and whois. - ''; + longDescription = '' + The GNU network utilities suite provides the + following tools: ftp(d), hostname, ifconfig, inetd, logger, ping, rcp, + rexec(d), rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d), + traceroute, uucpd, and whois. + ''; homepage = "https://www.gnu.org/software/inetutils/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 0bfdf8affc7b..efbf5c8c61c3 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -75,12 +75,12 @@ stdenv.mkDerivation rec { description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; homepage = "https://www.gnu.org/software/wget/"; license = licenses.gpl3Plus; - longDescription = - '' GNU Wget is a free software package for retrieving files using HTTP, - HTTPS and FTP, the most widely-used Internet protocols. It is a - non-interactive commandline tool, so it may easily be called from - scripts, cron jobs, terminals without X-Windows support, etc. - ''; + longDescription = '' + GNU Wget is a free software package for retrieving files using HTTP, + HTTPS and FTP, the most widely-used Internet protocols. It is a + non-interactive commandline tool, so it may easily be called from + scripts, cron jobs, terminals without X-Windows support, etc. + ''; mainProgram = "wget"; maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index b5f6535c96ba..7dc6d9f8dfa2 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "morph"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - hash = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; + hash = "sha256-IqWtVklzSq334cGgLx/13l329g391oDW50MZWyO6l08="; }; - vendorHash = "sha256-KV+djwUYNfD7NqmYkanRVeKj2lAGfMjJhCUSRiC4/yM="; + vendorHash = "sha256-zQlMtbXgrH83zrcIoOuFhb2tYCeQ1pz4UQUvRIsLMCE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 62fccb926ec4..a13b265a640e 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.26.0"; + version = "11.27.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-dbcTQuaUiVDcPKkYt10CJYHEleNqji1yEE8jEBBJtpg="; + hash = "sha256-6B+OiIX/9NkbroOhM4zNbWoKDbequS1sBk6QNlVEG1I="; }; proxyVendor = true; - vendorHash = "sha256-lG+PssQh/Cyp6Qgibm/OcJqnVecKERJNVLzKscIFnGo="; + vendorHash = "sha256-RjJ/UN0EvKTzR7XazRLStIht6wR0X7XIUDghMzRqEX4="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index ddc48085860b..341e87173bf1 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = with lib; { description = "PC/SC IFD Handler based on libnfc"; mainProgram = "ifdnfc-activate"; - longDescription = - '' libnfc Interface Plugin to be used in services.pcscd.plugins. + longDescription = '' + libnfc Interface Plugin to be used in services.pcscd.plugins. It provides support for all readers which are not supported by ccid but by libnfc. For activating your reader you need to run diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/tools/security/kubernetes-polaris/default.nix index ecda1966fcad..87ae92cd9e75 100644 --- a/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "9.4.1"; + version = "9.5.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-CVc/ZMF/3HBDPjny81Pj26eSnBuTRjXgkso34kZSex4="; + sha256 = "sha256-6dbp9gdobgL6afu+mzsqVBFQKT8lgxhKiEhQXN4Z5UY="; }; vendorHash = "sha256-X0GPKR6l1v5312hOmelrcqp4KT3LwsGkvKoqUfEM0uU="; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 083d605e5864..6f9eb684c200 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-wY7OninwYrFuP681Xffsv25XnOw8xWp3QAvrpTibnvk="; + hash = "sha256-L8HOuPENnyM56ac1dqJRCYzqN9wRnGt4RoF8BZji0Z0="; }; - vendorHash = "sha256-V/L6trRaCfV1qLKw1MsRWIh+RwAcoafvSW8zgA41maQ="; + vendorHash = "sha256-ZGFzZ/WpiVChtvMJQH3lR4k2it1KF0QwrMQchQz5XYw="; proxyVendor = true; # hash mismatch between Linux and Darwin subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 4fedf054a387..39c129b6b423 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -26,12 +26,12 @@ python3Packages.buildPythonApplication { description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys"; - longDescription = - '' This software will allow you to quickly and easily sign each UID on - a set of PGP keys. It is designed to take the pain out of the - sign-all-the-keys part of PGP Keysigning Party while adding security - to the process. - ''; + longDescription = '' + This software will allow you to quickly and easily sign each UID on + a set of PGP keys. It is designed to take the pain out of the + sign-all-the-keys part of PGP Keysigning Party while adding security + to the process. + ''; license = lib.licenses.gpl2Only; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 2b5e7e7bd33e..2e90558d3863 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -19,28 +19,28 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU ddrescue, a data recovery tool"; - longDescription = - '' GNU ddrescue is a data recovery tool. It copies data from one file - or block device (hard disc, cdrom, etc) to another, trying hard to - rescue data in case of read errors. + longDescription = '' + GNU ddrescue is a data recovery tool. It copies data from one file + or block device (hard disc, cdrom, etc) to another, trying hard to + rescue data in case of read errors. - The basic operation of ddrescue is fully automatic. That is, you - don't have to wait for an error, stop the program, read the log, run - it in reverse mode, etc. + The basic operation of ddrescue is fully automatic. That is, you + don't have to wait for an error, stop the program, read the log, run + it in reverse mode, etc. - If you use the logfile feature of ddrescue, the data is rescued very - efficiently (only the needed blocks are read). Also you can - interrupt the rescue at any time and resume it later at the same - point. + If you use the logfile feature of ddrescue, the data is rescued very + efficiently (only the needed blocks are read). Also you can + interrupt the rescue at any time and resume it later at the same + point. - Automatic merging of backups: If you have two or more damaged copies - of a file, cdrom, etc, and run ddrescue on all of them, one at a - time, with the same output file, you will probably obtain a complete - and error-free file. This is so because the probability of having - damaged areas at the same places on different input files is very - low. Using the logfile, only the needed blocks are read from the - second and successive copies. - ''; + Automatic merging of backups: If you have two or more damaged copies + of a file, cdrom, etc, and run ddrescue on all of them, one at a + time, with the same output file, you will probably obtain a complete + and error-free file. This is so because the probability of having + damaged areas at the same places on different input files is very + low. Using the logfile, only the needed blocks are read from the + second and successive copies. + ''; homepage = "https://www.gnu.org/software/ddrescue/ddrescue.html"; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 9fe830aa4d51..4c3a0db590ac 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { meta = { description = "Implementation of the Intelligent Platform Management Interface"; - longDescription = - '' GNU FreeIPMI provides in-band and out-of-band IPMI software based on - the IPMI v1.5/2.0 specification. The IPMI specification defines a - set of interfaces for platform management and is implemented by a - number vendors for system management. The features of IPMI that - most users will be interested in are sensor monitoring, system event - monitoring, power control, and serial-over-LAN (SOL). The FreeIPMI - tools and libraries listed below should provide users with the - ability to access and utilize these and many other features. A - number of useful features for large HPC or cluster environments have - also been implemented into FreeIPMI. See the README or FAQ for more - info. - ''; + longDescription = '' + GNU FreeIPMI provides in-band and out-of-band IPMI software based on + the IPMI v1.5/2.0 specification. The IPMI specification defines a + set of interfaces for platform management and is implemented by a + number vendors for system management. The features of IPMI that + most users will be interested in are sensor monitoring, system event + monitoring, power control, and serial-over-LAN (SOL). The FreeIPMI + tools and libraries listed below should provide users with the + ability to access and utilize these and many other features. A + number of useful features for large HPC or cluster environments have + also been implemented into FreeIPMI. See the README or FAQ for more + info. + ''; homepage = "https://www.gnu.org/software/freeipmi/"; downloadPage = "https://www.gnu.org/software/freeipmi/download.html"; diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/tools/system/gopsuinfo/default.nix index 1deeeee1722c..fcb84cfde870 100644 --- a/pkgs/tools/system/gopsuinfo/default.nix +++ b/pkgs/tools/system/gopsuinfo/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { ''; # Install icons - postInstall = '' make install DESTDIR=$out ''; + postInstall = ''make install DESTDIR=$out''; meta = with lib; { description = "Gopsutil-based command to display system usage info"; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index 2bf454777765..c38b76aeb2ea 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { meta = { description = "Data recovery tool for damaged hardware"; - longDescription = - '' Safecopy is a data recovery tool which tries to extract as much data as possible from a - problematic (i.e. damaged sectors) source - like floppy drives, hard disk partitions, CDs, - tape devices, etc, where other tools like dd would fail due to I/O errors. + longDescription = '' + Safecopy is a data recovery tool which tries to extract as much data as possible from a + problematic (i.e. damaged sectors) source - like floppy drives, hard disk partitions, CDs, + tape devices, etc, where other tools like dd would fail due to I/O errors. - Safecopy includes a low level IO layer to read CDROM disks in raw mode, and issue device - resets and other helpful low level operations on a number of other device classes. - ''; + Safecopy includes a low level IO layer to read CDROM disks in raw mode, and issue device + resets and other helpful low level operations on a number of other device classes. + ''; homepage = "https://safecopy.sourceforge.net"; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index e5aeb75ca626..e0bf73af04d8 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { meta = { description = "Converter from ASCII to PostScript, HTML, or RTF"; - longDescription = - '' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and - stores generated output to a file or sends it directly to the - printer. It includes features for `pretty-printing' - (language-sensitive code highlighting) in several programming - languages. + longDescription = '' + GNU Enscript converts ASCII files to PostScript, HTML, or RTF and + stores generated output to a file or sends it directly to the + printer. It includes features for `pretty-printing' + (language-sensitive code highlighting) in several programming + languages. - Enscript can be easily extended to handle different output media and - it has many options that can be used to customize printouts. - ''; + Enscript can be easily extended to handle different output media and + it has many options that can be used to customize printouts. + ''; license = lib.licenses.gpl3Plus; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 19d8652396c9..fee1a0eed8c6 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { description = "GNU Patch, a program to apply differences to files"; mainProgram = "patch"; - longDescription = - '' GNU Patch takes a patch file containing a difference listing - produced by the diff program and applies those differences to one or - more original files, producing patched versions. - ''; + longDescription = '' + GNU Patch takes a patch file containing a difference listing + produced by the diff program and applies those differences to one or + more original files, producing patched versions. + ''; homepage = "https://savannah.gnu.org/projects/patch"; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index d65c399d5ce8..a44316517dc1 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -39,6 +39,9 @@ in rustPlatform.buildRustPackage rec { }; }; + # override debug=true set in Cargo.toml upstream + RUSTFLAGS = "-C debuginfo=none"; + nativeBuildInputs = [ makeWrapper poppler_utils ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix index fab60f9832b7..fddaa22a2dbf 100644 --- a/pkgs/tools/virtualization/guestfs-tools/default.nix +++ b/pkgs/tools/virtualization/guestfs-tools/default.nix @@ -25,15 +25,16 @@ , pkg-config , qemu , xz +, gitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guestfs-tools"; - version = "1.52.0"; + version = "1.52.2"; src = fetchurl { - url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor version}-stable/guestfs-tools-${version}.tar.gz"; - sha256 = "sha256-Iv0TIpcEX5CmdAbw/w7uDyoBBqXxyNz8XDlqYl/3g3Y="; + url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor finalAttrs.version}-stable/guestfs-tools-${finalAttrs.version}.tar.gz"; + hash = "sha256-02khDS2NLG1QOSqswtDoqBX2Mg6sE/OiUoP9JFs4vTU="; }; nativeBuildInputs = [ @@ -55,9 +56,7 @@ stdenv.mkDerivation rec { ]) ++ (with ocamlPackages; [ findlib - gettext-stub ocaml - ocaml_gettext ounit2 ]); @@ -107,11 +106,18 @@ stdenv.mkDerivation rec { --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]} ''; - meta = with lib; { - description = "Extra tools for accessing and modifying virtual machine disk images"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - homepage = "https://libguestfs.org/"; - maintainers = [ ]; - platforms = platforms.linux; + passthru.updateScript = gitUpdater { + url = "https://github.com/libguestfs/guestfs-tools"; + rev-prefix = "v"; + odd-unstable = true; }; -} + + meta = { + description = "Extra tools for accessing and modifying virtual machine disk images"; + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + homepage = "https://libguestfs.org/"; + changelog = "https://www.libguestfs.org/guestfs-tools-release-notes-${lib.versions.majorMinor finalAttrs.version}.1.html"; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2014b9ce30fc..a403b1600e0b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -826,6 +826,7 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 + oil = lib.warn "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22 onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 @@ -1083,7 +1084,10 @@ mapAliases { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; steam = lib.warn "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; steam-fhsenv = lib.warn "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; + steam-fhsenv-small = lib.warn "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; steam-fhsenv-without-steam = lib.warn "`steamPackages.steam-fhsenv-without-steam` has been moved to top level as `steam-fhsenv-without-steam`" steam-fhsenv-without-steam; + steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; + steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; steamcmd = lib.warn "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; }; steam-small = steam; # Added 2024-09-12 @@ -1232,6 +1236,7 @@ mapAliases { ### X ### + x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22 xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17 xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17 xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e21f87842189..518df9b5f1ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -196,6 +196,8 @@ with pkgs; appimageTools = callPackage ../build-support/appimage { }; + appimageupdate-qt = appimageupdate.override { withQtUI = true; }; + appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; bindle = callPackage ../servers/bindle { @@ -11169,7 +11171,9 @@ with pkgs; pingtcp = callPackage ../tools/networking/pingtcp { }; - pingu = callPackage ../tools/networking/pingu { }; + pingu = callPackage ../tools/networking/pingu { + buildGoModule = buildGo122Module; + }; pinnwand = callPackage ../servers/pinnwand { }; @@ -12741,6 +12745,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; + buildGoModule = buildGo122Module; }) teleport_15 teleport_16 teleport; telepresence = callPackage ../tools/networking/telepresence { @@ -21022,10 +21027,6 @@ with pkgs; libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; - libhv = callPackage ../development/libraries/libhv { - inherit (darwin.apple_sdk.frameworks) Security; - }; - libhwy = callPackage ../development/libraries/libhwy { }; libHX = callPackage ../development/libraries/libHX { }; @@ -22562,9 +22563,6 @@ with pkgs; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { abseil-cpp = abseil-cpp_202103; }; - protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { - abseil-cpp = abseil-cpp_202103; - }; }) protobuf_28 protobuf_27 @@ -22573,7 +22571,6 @@ with pkgs; protobuf_24 protobuf_23 protobuf_21 - protobuf3_20 ; protobufc = callPackage ../development/libraries/protobufc { }; @@ -24371,8 +24368,6 @@ with pkgs; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; - janus-gateway = callPackage ../servers/janus-gateway { }; - janusgraph = callPackage ../servers/nosql/janusgraph { }; jboss = callPackage ../servers/http/jboss { }; @@ -28989,8 +28984,6 @@ with pkgs; kerbrute = callPackage ../tools/security/kerbrute { }; - komikku = callPackage ../applications/graphics/komikku { }; - kvmtool = callPackage ../applications/virtualization/kvmtool { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -30235,7 +30228,7 @@ with pkgs; jaeles = callPackage ../tools/security/jaeles { }; - jalv = callPackage ../applications/audio/jalv { }; + jalv-qt = jalv.override { useQt = true; }; jameica = callPackage ../applications/office/jameica { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -32245,8 +32238,6 @@ with pkgs; sc-im = callPackage ../applications/misc/sc-im { }; - scite = callPackage ../applications/editors/scite { }; - scli = callPackage ../applications/misc/scli { }; scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { }; @@ -37083,14 +37074,10 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gummy = callPackage ../tools/misc/gummy { }; - hashpump = callPackage ../tools/misc/hashpump { }; hck = callPackage ../tools/text/hck { }; - helm = callPackage ../applications/audio/helm { }; - helmfile = callPackage ../applications/networking/cluster/helmfile { }; helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile { diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index af4f2fa7f1cd..083c944aa317 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -66,10 +66,9 @@ rec { echo "Compiling a custom test" set -x emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \ - ./.libs/'' - + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin "libxml2.dylib " - + pkgs.lib.optionalString (!pkgs.stdenv.hostPlatform.isDarwin) "libxml2.a " - + '' `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ + ./.libs/${ + if pkgs.stdenv.hostPlatform.isDarwin then "libxml2.dylib" else "libxml2.a" + } `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ --embed-file ./test/xmlid/id_err1.xml echo "Using node to execute the test which basically outputs an error on stderr which we grep for" diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8099591d0c6a..b9225acdb2b7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -54,7 +54,7 @@ let broken = kernel.meta.broken; }; }; - kernelPatches = kernel.kernelPatches ++ [ + kernelPatches = lib.filter ({ name ? null, ... }: name != "netfilter-typo-fix") kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; isHardened = true; @@ -138,6 +138,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -146,6 +147,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -154,6 +156,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -162,6 +165,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -170,6 +174,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -178,14 +183,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate - ]; - }; - - linux_6_10 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.10"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -194,6 +192,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -205,6 +204,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; latest = packageAliases.linux_latest.kernel; @@ -280,6 +280,7 @@ in { linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8 = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream"; + linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -290,6 +291,7 @@ in { linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; + linux_6_10_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; })); /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -619,7 +621,6 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); - linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); } // lib.optionalAttrs config.allowAliases { linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -629,6 +630,7 @@ in { linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04 linux_6_8 = throw "linux 6.8 was removed because it reached its end of life upstream"; # Added 2024-08-02 linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02 + linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23 }; rtPackages = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e87e1ee17e69..fc2904ec43ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10559,6 +10559,10 @@ self: super: with self; { pocket = callPackage ../development/python-modules/pocket { }; + pocketsphinx = callPackage ../development/python-modules/pocketsphinx { + inherit (pkgs) pocketsphinx; + }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; podcats = callPackage ../development/python-modules/podcats { }; @@ -10724,11 +10728,6 @@ self: super: with self; { proto-plus = callPackage ../development/python-modules/proto-plus { }; - # Protobuf 3.x - protobuf3 = callPackage ../development/python-modules/protobuf/3.nix { - protobuf = pkgs.protobuf3_20; - }; - # Protobuf 4.x protobuf4 = callPackage ../development/python-modules/protobuf/4.nix { protobuf = pkgs.protobuf_25;