diff --git a/.github/labeler.yml b/.github/labeler.yml index 9ef1ec30b6e9..148aa3d7c48d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -270,6 +270,12 @@ - changed-files: - any-glob-to-any-file: - .github/**/* + - CONTRIBUTING.md + - pkgs/README.md + - nixos/README.md + - maintainers/README.md + - lib/README.md + - doc/README.md "6.topic: printing": - any: diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 2a48d88cbf73..685856f16f69 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -429,8 +429,8 @@ checkConfigOutput '^null$' config.value.l1.l2.foo ./types-anything/nested-attrs. checkConfigOutput '^null$' config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix # Attribute sets that are coercible to strings shouldn't be recursed into checkConfigOutput '^"foo"$' config.value.outPath ./types-anything/attrs-coercible.nix -# Multiple lists aren't concatenated together -checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix +# Multiple lists aren't concatenated together if their definitions are not equal +checkConfigError 'The option .* has conflicting definition values' config.value ./types-anything/lists.nix # Check that all equalizable atoms can be used as long as all definitions are equal checkConfigOutput '^0$' config.value.int ./types-anything/equal-atoms.nix checkConfigOutput '^false$' config.value.bool ./types-anything/equal-atoms.nix @@ -438,6 +438,7 @@ checkConfigOutput '^""$' config.value.string ./types-anything/equal-atoms.nix checkConfigOutput '^"/[^"]+"$' config.value.path ./types-anything/equal-atoms.nix checkConfigOutput '^null$' config.value.null ./types-anything/equal-atoms.nix checkConfigOutput '^0.1$' config.value.float ./types-anything/equal-atoms.nix +checkConfigOutput '^\[1,"a",{"x":null}\]$' config.value.list ./types-anything/equal-atoms.nix # Functions can't be merged together checkConfigError "The option .value.multiple-lambdas.. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix checkConfigOutput '^true$' config.valueIsFunction.single-lambda ./types-anything/functions.nix diff --git a/lib/tests/modules/types-anything/equal-atoms.nix b/lib/tests/modules/types-anything/equal-atoms.nix index 9925cfd60892..28d2b53ceee3 100644 --- a/lib/tests/modules/types-anything/equal-atoms.nix +++ b/lib/tests/modules/types-anything/equal-atoms.nix @@ -12,6 +12,7 @@ value.path = ./.; value.null = null; value.float = 0.1; + value.list = [1 "a" {x=null;}]; } { value.int = 0; @@ -20,6 +21,7 @@ value.path = ./.; value.null = null; value.float = 0.1; + value.list = [1 "a" {x=null;}]; } ]; diff --git a/lib/tests/modules/types-anything/lists.nix b/lib/tests/modules/types-anything/lists.nix index bd846afd3d18..21ca9d24f7a8 100644 --- a/lib/tests/modules/types-anything/lists.nix +++ b/lib/tests/modules/types-anything/lists.nix @@ -6,10 +6,10 @@ config = lib.mkMerge [ { - value = [ null ]; + value = [ "a value" ]; } { - value = [ null ]; + value = [ "another value" ]; } ]; diff --git a/lib/types.nix b/lib/types.nix index 86b717afd122..6c4a66c4e3c0 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -253,12 +253,6 @@ rec { mergeFunction = { # Recursively merge attribute sets set = (attrsOf anything).merge; - # Safe and deterministic behavior for lists is to only accept one definition - # listOf only used to apply mkIf and co. - list = - if length defs > 1 - then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." - else (listOf anything).merge; # This is the type of packages, only accept a single definition stringCoercibleSet = mergeOneOption; lambda = loc: defs: arg: anything.merge diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 26cecd9d0dda..1b1f1f5e4f8a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12478,12 +12478,6 @@ githubId = 7910815; name = "Alex McGrath"; }; - lychee = { - email = "itslychee+nixpkgs@protonmail.com"; - githubId = 82718618; - github = "itslychee"; - name = "Lychee"; - }; lyndeno = { name = "Lyndon Sanche"; email = "lsanche@lyndeno.ca"; @@ -16477,6 +16471,12 @@ githubId = 20472367; name = "Peter Hebden"; }; + pixelsergey = { + email = "sergey.ichtchenko@gmail.com"; + github = "PixelSergey"; + githubId = 14542417; + name = "Sergey Ichtchenko"; + }; pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "waaamb"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4ee99750198e..2742b8419411 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -46,6 +46,16 @@ If you experience any issues, please report them. The original Perl script can still be used for now by setting `system.switch.enableNg` to `false`. +- The [Xen Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable). + - This release includes Xen [4.17.5](https://wiki.xenproject.org/wiki/Xen_Project_4.17_Release_Notes), [4.18.3](https://wiki.xenproject.org/wiki/Xen_Project_4.18_Release_Notes) and [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes), as well as support for booting the hypervisor on EFI systems. + ::: {.warning} + Booting into Xen through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported. + ::: + - There are two flavours of Xen available by default: `xen`, which includes all built-in components, and `xen-slim`, which replaces the built-in components with their Nixpkgs equivalents. + - The `qemu-xen-traditional` component has been deprecated by upstream Xen, and is no longer available in any of the Xen packages. + - The OCaml-based Xen Store can now be configured using [`virtualisation.xen.store.settings`](#opt-virtualisation.xen.store.settings). + - The `virtualisation.xen.bridge` options have been deprecated in this release cycle. Users who need network bridges are encouraged to set up their own networking configurations. + ## New Modules {#sec-release-24.11-new-modules} - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). @@ -87,6 +97,8 @@ - [HomeBox](https://github.com/sysadminsmedia/homebox): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable). +- [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable). + - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). - [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable). @@ -510,6 +522,8 @@ - Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details. Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default. +- `zfs.latestCompatibleLinuxPackages` is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention. + - The `shadowstack` hardening flag has been added, though disabled by default. - `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 006cdeedcaf6..5068a04c8d34 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -265,6 +265,7 @@ ./programs/pqos-wrapper.nix ./programs/projecteur.nix ./programs/proxychains.nix + ./programs/pulseview.nix ./programs/qdmr.nix ./programs/qgroundcontrol.nix ./programs/qt5ct.nix @@ -698,6 +699,7 @@ ./services/matrix/conduit.nix ./services/matrix/dendrite.nix ./services/matrix/hebbot.nix + ./services/matrix/hookshot.nix ./services/matrix/maubot.nix ./services/matrix/mautrix-facebook.nix ./services/matrix/mautrix-meta.nix diff --git a/nixos/modules/programs/pulseview.nix b/nixos/modules/programs/pulseview.nix new file mode 100644 index 000000000000..f8db5a467d53 --- /dev/null +++ b/nixos/modules/programs/pulseview.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.pulseview; +in +{ + options.programs.pulseview = { + enable = lib.mkEnableOption "pulseview, a sigrok GUI"; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.pulseview + ]; + + services.udev = { + packages = [ + # Pulseview needs some udev rules provided by libsigrok to access devices + pkgs.libsigrok + ]; + }; + }; +} diff --git a/nixos/modules/programs/yubikey-touch-detector.nix b/nixos/modules/programs/yubikey-touch-detector.nix index 9a0d107f73c9..42beabbc4e94 100644 --- a/nixos/modules/programs/yubikey-touch-detector.nix +++ b/nixos/modules/programs/yubikey-touch-detector.nix @@ -1,9 +1,44 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.yubikey-touch-detector; -in { +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) types; + cfg = config.programs.yubikey-touch-detector; +in +{ options = { programs.yubikey-touch-detector = { + enable = lib.mkEnableOption "yubikey-touch-detector"; + + libnotify = lib.mkOption { + # This used to be true previously and using libnotify would be a sane default. + default = true; + type = types.bool; + description = '' + If set to true, yubikey-touch-detctor will send notifications using libnotify + ''; + }; + + unixSocket = lib.mkOption { + default = true; + type = types.bool; + description = '' + If set to true, yubikey-touch-detector will send notifications to a unix socket + ''; + }; + + verbose = lib.mkOption { + default = false; + type = types.bool; + description = '' + Enables verbose logging + ''; + }; + }; }; @@ -12,6 +47,13 @@ in { systemd.user.services.yubikey-touch-detector = { path = [ pkgs.gnupg ]; + + environment = { + YUBIKEY_TOUCH_DETECTOR_LIBNOTIFY = builtins.toString cfg.libnotify; + YUBIKEY_TOUCH_DETECTOR_NOSOCKET = builtins.toString (!cfg.unixSocket); + YUBIKEY_TOUCH_DETECTOR_VERBOSE = builtins.toString cfg.verbose; + }; + wantedBy = [ "graphical-session.target" ]; }; systemd.user.sockets.yubikey-touch-detector = { diff --git a/nixos/modules/services/matrix/hookshot.nix b/nixos/modules/services/matrix/hookshot.nix new file mode 100644 index 000000000000..d6329e91459e --- /dev/null +++ b/nixos/modules/services/matrix/hookshot.nix @@ -0,0 +1,127 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.matrix-hookshot; + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "matrix-hookshot-config.yml" cfg.settings; +in +{ + options = { + services.matrix-hookshot = { + enable = lib.mkEnableOption "matrix-hookshot, a bridge between Matrix and project management services"; + + package = lib.mkPackageOption pkgs "matrix-hookshot" { }; + + registrationFile = lib.mkOption { + type = lib.types.path; + description = '' + Appservice registration file. + As it contains secret tokens, you may not want to add this to the publicly readable Nix store. + ''; + example = lib.literalExpression '' + pkgs.writeText "matrix-hookshot-registration" \'\' + id: matrix-hookshot + as_token: aaaaaaaaaa + hs_token: aaaaaaaaaa + namespaces: + rooms: [] + users: + - regex: "@_webhooks_.*:foobar" + exclusive: true + + sender_localpart: hookshot + url: "http://localhost:9993" + rate_limited: false + \'\' + ''; + }; + + settings = lib.mkOption { + description = '' + {file}`config.yml` configuration as a Nix attribute set. + + For details please see the [documentation](https://matrix-org.github.io/matrix-hookshot/latest/setup/sample-configuration.html). + ''; + example = { + bridge = { + domain = "example.com"; + url = "http://localhost:8008"; + mediaUrl = "https://example.com"; + port = 9993; + bindAddress = "127.0.0.1"; + }; + listeners = [ + { + port = 9000; + bindAddress = "0.0.0.0"; + resources = [ "webhooks" ]; + } + { + port = 9001; + bindAddress = "localhost"; + resources = [ + "metrics" + "provisioning" + ]; + } + ]; + }; + default = { }; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + passFile = lib.mkOption { + type = lib.types.path; + default = "/var/lib/matrix-hookshot/passkey.pem"; + description = '' + A passkey used to encrypt tokens stored inside the bridge. + File will be generated if not found. + ''; + }; + }; + }; + }; + + serviceDependencies = lib.mkOption { + type = with lib.types; listOf str; + default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit; + defaultText = lib.literalExpression '' + lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit + ''; + description = '' + List of Systemd services to require and wait for when starting the application service, + such as the Matrix homeserver if it's running on the same host. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.matrix-hookshot = { + description = "a bridge between Matrix and multiple project management services"; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ] ++ cfg.serviceDependencies; + after = [ "network-online.target" ] ++ cfg.serviceDependencies; + + preStart = '' + if [ ! -f '${cfg.settings.passFile}' ]; then + mkdir -p $(dirname '${cfg.settings.passFile}') + ${pkgs.openssl}/bin/openssl genpkey -out '${cfg.settings.passFile}' -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:4096 + fi + ''; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${cfg.package}/bin/matrix-hookshot ${configFile} ${cfg.registrationFile}"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ flandweber ]; +} diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index ce4ecbeb7279..ae9d1fa31be2 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -36,7 +36,6 @@ let - @@ -52,7 +51,7 @@ let yes yes yes - diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index 2b75707ad99e..797f0d81f14c 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -54,6 +54,30 @@ in ''; }; + mirroredBoots = mkOption { + default = [ { path = "/boot"; } ]; + example = [ + { path = "/boot1"; } + { path = "/boot2"; } + ]; + description = '' + Mirror the boot configuration to multiple paths. + ''; + + type = with types; listOf (submodule { + options = { + path = mkOption { + example = "/boot1"; + type = types.str; + description = '' + The path to the boot directory where the extlinux-compatible + configuration files will be written. + ''; + }; + }; + }); + }; + populateCmd = mkOption { type = types.str; readOnly = true; @@ -72,11 +96,27 @@ in builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}" + lib.optionalString (!cfg.useGenerationDeviceTree) " -r"; + installBootLoader = pkgs.writeScript "install-extlinux-conf.sh" ('' + #!${pkgs.runtimeShell} + set -e + '' + flip concatMapStrings cfg.mirroredBoots (args: '' + ${builder} ${builderArgs} -d '${args.path}' -c "$@" + '')); in mkIf cfg.enable { - system.build.installBootLoader = "${builder} ${builderArgs} -c"; + system.build.installBootLoader = installBootLoader; system.boot.loader.id = "generic-extlinux-compatible"; boot.loader.generic-extlinux-compatible.populateCmd = "${populateBuilder} ${builderArgs}"; + + assertions = [ + { + assertion = cfg.mirroredBoots != [ ]; + message = '' + You must not remove all elements from option 'boot.loader.generic-extlinux-compatible.mirroredBoots', + otherwise the system will not be bootable. + ''; + } + ]; }; } diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 612f6c5bc765..1a65686af37c 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -75,6 +75,11 @@ in { after = [ "multi-user.target" ]; requires = [ "network-online.target" ]; + path = [ + "/run/wrappers" + "/run/current-system/sw" + ]; + restartIfChanged = false; unitConfig.X-StopOnRemoval = false; diff --git a/nixos/modules/virtualisation/xen-boot-builder.sh b/nixos/modules/virtualisation/xen-boot-builder.sh new file mode 100755 index 000000000000..13e1a4e20243 --- /dev/null +++ b/nixos/modules/virtualisation/xen-boot-builder.sh @@ -0,0 +1,165 @@ +# This script is called by ./xen-dom0.nix to create the Xen boot entries. +# shellcheck shell=bash + +# Handle input argument and exit if the flag is invalid. See virtualisation.xen.efi.bootBuilderVerbosity below. +[[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1 +case "$1" in + "quiet") true ;; + "default" | "info") echo -n "Installing Xen Hypervisor boot entries..." ;; + "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m called with the '$1' flag" ;; + *) + echo -e "\e[1;31merror:\e[0m xenBootBuilder was called with an invalid argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." + exit 2 + ;; +esac + +# Get the current Xen generations and store them in an array. This will be used +# for displaying the diff later, if xenBootBuilder was called with `info`. +# We also delete the current Xen entries here, as they'll be rebuilt later if +# the corresponding NixOS generation still exists. +mapfile -t preGenerations < <(find "$efiMountPoint"/loader/entries -type f -name 'xen-*.conf' | sort -V | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g') +if [ "$1" = "debug" ]; then + if ((${#preGenerations[@]} == 0)); then + echo -e "\e[1;34mxenBootBuilder:\e[0m no previous Xen entries." + else + echo -e "\e[1;34mxenBootBuilder:\e[0m deleting the following stale xen entries:" && for debugGen in "${preGenerations[@]}"; do echo " - $debugGen"; done + fi +fi + +# Cleanup all Xen entries. +rm -f "$efiMountPoint"/{loader/entries/xen-*.conf,efi/nixos/xen-*.efi} + +# Main array for storing which generations exist in $efiMountPoint after +# systemd-boot-builder.py builds the main entries. +mapfile -t gens < <(find "$efiMountPoint"/loader/entries -type f -name 'nixos-*.conf' | sort -V) +[ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m found the following NixOS boot entries:" && for debugGen in "${gens[@]}"; do echo " - $debugGen"; done + +# This is the main loop that installs the Xen entries. +for gen in "${gens[@]}"; do + + # We discover the path to Bootspec through the init attribute in the entries, + # as it is equivalent to $toplevel/init. + bootspecFile="$(sed -nr 's/^options init=(.*)\/init.*$/\1/p' "$gen")/boot.json" + [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m processing bootspec file $bootspecFile" + + # We do nothing if the Bootspec for the current $gen does not contain the Xen + # extension, which is added as a configuration attribute below. + if grep -sq '"org.xenproject.bootspec.v1"' "$bootspecFile"; then + [ "$1" = "debug" ] && echo -e " \e[1;32msuccess:\e[0m found Xen entries in $gen." + + # TODO: Support DeviceTree booting. Xen has some special handling for DeviceTree + # attributes, which will need to be translated in a boot script similar to this + # one. Having a DeviceTree entry is rare, and it is not always required for a + # successful boot, so we don't fail here, only warn with `debug`. + if grep -sq '"devicetree"' "$bootspecFile"; then + echo -e "\n\e[1;33mwarning:\e[0m $gen has a \e[1;34morg.nixos.systemd-boot.devicetree\e[0m Bootspec entry. Xen currently does not support DeviceTree, so this value will be ignored in the Xen boot entries, which may cause them to \e[1;31mfail to boot\e[0m." + else + [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m no DeviceTree entries found in $gen." + fi + + # Prepare required attributes for `xen.cfg/xen.conf`. It inherits the name of + # the corresponding nixos generation, substituting `nixos` with `xen`: + # `xen-$profile-generation-$number-specialisation-$specialisation.{cfg,conf}` + xenGen=$(echo "$gen" | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g') + bootParams=$(jq -re '."org.xenproject.bootspec.v1".xenParams | join(" ")' "$bootspecFile") + kernel=$(jq -re '."org.nixos.bootspec.v1".kernel | sub("^/nix/store/"; "") | sub("/bzImage"; "-bzImage.efi")' "$bootspecFile") + kernelParams=$(jq -re '."org.nixos.bootspec.v1".kernelParams | join(" ")' "$bootspecFile") + initrd=$(jq -re '."org.nixos.bootspec.v1".initrd | sub("^/nix/store/"; "") | sub("/initrd"; "-initrd.efi")' "$bootspecFile") + init=$(jq -re '."org.nixos.bootspec.v1".init' "$bootspecFile") + title=$(sed -nr 's/^title (.*)$/\1/p' "$gen") + version=$(sed -nr 's/^version (.*)$/\1/p' "$gen") + machineID=$(sed -nr 's/^machine-id (.*)$/\1/p' "$gen") + sortKey=$(sed -nr 's/^sort-key (.*)$/\1/p' "$gen") + + # Write `xen.cfg` to a temporary location prior to UKI creation. + tmpCfg=$(mktemp) + [ "$1" = "debug" ] && echo -ne "\e[1;34mxenBootBuilder:\e[0m writing $xenGen.cfg to temporary file..." + cat > "$tmpCfg" << EOF +[global] +default=xen + +[xen] +options=$bootParams +kernel=$kernel init=$init $kernelParams +ramdisk=$initrd +EOF + [ "$1" = "debug" ] && echo -e "done." + + # Create Xen UKI for $generation. Most of this is lifted from + # https://xenbits.xenproject.org/docs/unstable/misc/efi.html. + [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m making Xen UKI..." + xenEfi=$(jq -re '."org.xenproject.bootspec.v1".xen' "$bootspecFile") + padding=$(objdump --header --section=".pad" "$xenEfi" | awk '/\.pad/ { printf("0x%016x\n", strtonum("0x"$3) + strtonum("0x"$4))};') + [ "$1" = "debug" ] && echo " - padding: $padding" + objcopy \ + --add-section .config="$tmpCfg" \ + --change-section-vma .config="$padding" \ + "$xenEfi" \ + "$efiMountPoint"/EFI/nixos/"$xenGen".efi + [ "$1" = "debug" ] && echo -e " - \e[1;32msuccessfully built\e[0m $xenGen.efi" + rm -f "$tmpCfg" + + # Write `xen.conf`. + [ "$1" = "debug" ] && echo -ne "\e[1;34mxenBootBuilder:\e[0m writing $xenGen.conf to EFI System Partition..." + cat > "$efiMountPoint"/loader/entries/"$xenGen".conf << EOF +title $title (with Xen Hypervisor) +version $version +efi /EFI/nixos/$xenGen.efi +machine-id $machineID +sort-key $sortKey +EOF + [ "$1" = "debug" ] && echo -e "done." + + # Sometimes, garbage collection weirdness causes a generation to still exist in + # the loader entries, but its Bootspec file was deleted. We consider such a + # generation to be invalid, but we don't write extra code to handle this + # situation, as supressing grep's error messages above is quite enough, and the + # error message below is still technically correct, as no Xen can be found in + # something that does not exist. + else + [ "$1" = "debug" ] && echo -e " \e[1;33mwarning:\e[0m \e[1;31mno Xen found\e[0m in $gen." + fi +done + +# Counterpart to the preGenerations array above. We use it to diff the +# generations created/deleted when callled with the `info` argument. +mapfile -t postGenerations < <(find "$efiMountPoint"/loader/entries -type f -name 'xen-*.conf' | sort -V | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g') + +# In the event the script does nothing, guide the user to debug, as it'll only +# ever run when Xen is enabled, and it makes no sense to enable Xen and not have +# any hypervisor boot entries. +if ((${#postGenerations[@]} == 0)); then + case "$1" in + "default" | "info") echo "none found." && echo -e "If you believe this is an error, set the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option to \e[1;34m\"debug\"\e[0m and rebuild to print debug logs." ;; + "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m wrote \e[1;31mno generations\e[0m. Most likely, there were no generations with a valid \e[1;34morg.xenproject.bootspec.v1\e[0m entry." ;; + esac + +# If the script is successful, change the default boot, say "done.", write a +# diff, or print the total files written, depending on the argument this script +# was called with. We use some dumb dependencies here, like `diff` or `bat` for +# colourisation, but they're only included with the `info` argument. +# +# It's also fine to change the default here, as this runs after the +# `systemd-boot-builder.py` script, which overwrites the file, and this script +# does not run after an user disables the Xen module. +else + sed --in-place 's/^default nixos-/default xen-/g' "$efiMountPoint"/loader/loader.conf + case "$1" in + "default" | "info") echo "done." ;; + "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m \e[1;32msuccessfully wrote\e[0m the following generations:" && for debugGen in "${postGenerations[@]}"; do echo " - $debugGen"; done ;; + esac + if [ "$1" = "info" ]; then + if [[ ${#preGenerations[@]} == "${#postGenerations[@]}" ]]; then + echo -e "\e[1;33mNo Change:\e[0m Xen Hypervisor boot entries were refreshed, but their contents are identical." + else + echo -e "\e[1;32mSuccess:\e[0m Changed the following boot entries:" + # We briefly unset errexit and pipefail here, as GNU diff has no option to not fail when files differ. + set +o errexit + set +o pipefail + diff <(echo "${preGenerations[*]}" | tr ' ' '\n') <(echo "${postGenerations[*]}" | tr ' ' '\n') -U 0 | grep --invert-match --extended-regexp '^(@@|---|\+\+\+).*' | sed '1{/^-$/d}' | bat --language diff --theme ansi --paging=never --plain + true + set -o errexit + set -o pipefail + fi + fi +fi diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 2fb8c6cd4566..db0971065900 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -1,452 +1,870 @@ # Xen hypervisor (Dom0) support. -{ config, lib, pkgs, ... }: - -with lib; +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.xen; + + xenBootBuilder = pkgs.writeShellApplication { + name = "xenBootBuilder"; + runtimeInputs = + (with pkgs; [ + binutils + coreutils + findutils + gawk + gnugrep + gnused + jq + ]) + ++ lib.lists.optionals (cfg.efi.bootBuilderVerbosity == "info") ( + with pkgs; + [ + bat + diffutils + ] + ); + runtimeEnv = { + efiMountPoint = config.boot.loader.efi.efiSysMountPoint; + }; + text = builtins.readFile ./xen-boot-builder.sh; + }; in { - imports = [ - (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") - (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ]) + imports = with lib.modules; [ + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "name" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "address" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "prefixLength" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "forwardDns" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRenamedOptionModule + [ + "virtualisation" + "xen" + "qemu-package" + ] + [ + "virtualisation" + "xen" + "qemu" + "package" + ] + ) + (mkRenamedOptionModule + [ + "virtualisation" + "xen" + "package-qemu" + ] + [ + "virtualisation" + "xen" + "qemu" + "package" + ] + ) + (mkRenamedOptionModule + [ + "virtualisation" + "xen" + "stored" + ] + [ + "virtualisation" + "xen" + "store" + "path" + ] + ) ]; - ###### interface + ## Interface ## - options = { + options.virtualisation.xen = { - virtualisation.xen.enable = - mkOption { - default = false; - type = types.bool; + enable = lib.options.mkEnableOption "the Xen Hypervisor, a virtualisation technology defined as a *type-1 hypervisor*, which allows multiple virtual machines, known as *domains*, to run concurrently on the physical machine. NixOS runs as the privileged *Domain 0*. This option requires a reboot into a Xen kernel to take effect"; + + debug = lib.options.mkEnableOption "Xen debug features for Domain 0. This option enables some hidden debugging tests and features, and should not be used in production"; + + trace = lib.options.mkOption { + type = lib.types.bool; + default = cfg.debug; + defaultText = lib.options.literalExpression "false"; + example = true; + description = "Whether to enable Xen debug tracing and logging for Domain 0."; + }; + + package = lib.options.mkOption { + type = lib.types.package; + default = pkgs.xen; + defaultText = lib.options.literalExpression "pkgs.xen"; + example = lib.options.literalExpression "pkgs.xen-slim"; + description = '' + The package used for Xen Hypervisor. + ''; + relatedPackages = [ + "xen" + "xen-slim" + ]; + }; + + qemu = { + package = lib.options.mkOption { + type = lib.types.package; + default = pkgs.xen; + defaultText = lib.options.literalExpression "pkgs.xen"; + example = lib.options.literalExpression "pkgs.qemu_xen"; description = '' - Setting this option enables the Xen hypervisor, a - virtualisation technology that allows multiple virtual - machines, known as *domains*, to run - concurrently on the physical machine. NixOS runs as the - privileged *Domain 0*. This option - requires a reboot to take effect. - ''; + The package with QEMU binaries that runs in Domain 0 + and virtualises the unprivileged domains. + ''; + relatedPackages = [ + "xen" + { + name = "qemu_xen"; + comment = "For use with `pkgs.xen-slim`."; + } + ]; + }; + pidFile = lib.options.mkOption { + type = lib.types.path; + default = "/run/xen/qemu-dom0.pid"; + example = "/var/run/xen/qemu-dom0.pid"; + description = "Path to the QEMU PID file."; }; - - virtualisation.xen.package = mkOption { - type = types.package; - defaultText = literalExpression "pkgs.xen"; - example = literalExpression "pkgs.xen-light"; - description = '' - The package used for Xen binary. - ''; - relatedPackages = [ "xen" "xen-light" ]; }; - virtualisation.xen.package-qemu = mkOption { - type = types.package; - defaultText = literalExpression "pkgs.xen"; - example = literalExpression "pkgs.qemu_xen-light"; - description = '' - The package with qemu binaries for dom0 qemu and xendomains. + bootParams = lib.options.mkOption { + default = [ ]; + example = '' + [ + "iommu=force:true,qinval:true,debug:true" + "noreboot=true" + "vga=ask" + ] + ''; + type = lib.types.listOf lib.types.str; + description = '' + Xen Command Line parameters passed to Domain 0 at boot time. + Note: these are different from `boot.kernelParams`. See + the [Xen documentation](https://xenbits.xenproject.org/docs/unstable/misc/xen-command-line.html) for more information. ''; - relatedPackages = [ "xen" - { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; } - ]; }; - virtualisation.xen.bootParams = - mkOption { - default = []; - type = types.listOf types.str; - description = - '' - Parameters passed to the Xen hypervisor at boot time. - ''; + efi = { + bootBuilderVerbosity = lib.options.mkOption { + type = lib.types.enum [ + "default" + "info" + "debug" + "quiet" + ]; + default = "default"; + example = "info"; + description = '' + The EFI boot entry builder script should be called with exactly one of the following arguments in order to specify its verbosity: + + - `quiet` supresses all messages. + + - `default` adds a simple "Installing Xen Hypervisor boot entries...done." message to the script. + + - `info` is the same as `default`, but it also prints a diff with information on which generations were altered. + - This option adds two extra dependencies to the script: `diffutils` and `bat`. + + - `debug` prints information messages for every single step of the script. + + This option does not alter the actual functionality of the script, just the number of messages printed when rebuilding the system. + ''; }; - virtualisation.xen.domain0MemorySize = - mkOption { + path = lib.options.mkOption { + type = lib.types.path; + default = "${cfg.package.boot}/${cfg.package.efi}"; + defaultText = lib.options.literalExpression "\${config.virtualisation.xen.package.boot}/\${config.virtualisation.xen.package.efi}"; + example = lib.options.literalExpression "\${config.virtualisation.xen.package}/boot/efi/efi/nixos/xen-\${config.virtualisation.xen.package.version}.efi"; + description = '' + Path to xen.efi. `pkgs.xen` is patched to install the xen.efi file + on `$boot/boot/xen.efi`, but an unpatched Xen build may install it + somewhere else, such as `$out/boot/efi/efi/nixos/xen.efi`. Unless + you're building your own Xen derivation, you should leave this + option as the default value. + ''; + }; + }; + + dom0Resources = { + maxVCPUs = lib.options.mkOption { + default = 0; + example = 4; + type = lib.types.ints.unsigned; + description = '' + Amount of virtual CPU cores allocated to Domain 0 on boot. + If set to 0, all cores are assigned to Domain 0, and + unprivileged domains will compete with Domain 0 for CPU time. + ''; + }; + + memory = lib.options.mkOption { default = 0; example = 512; - type = types.addCheck types.int (n: n >= 0); - description = - '' - Amount of memory (in MiB) allocated to Domain 0 on boot. - If set to 0, all memory is assigned to Domain 0. - ''; + type = lib.types.ints.unsigned; + description = '' + Amount of memory (in MiB) allocated to Domain 0 on boot. + If set to 0, all memory is assigned to Domain 0, and + unprivileged domains will compete with Domain 0 for free RAM. + ''; }; - virtualisation.xen.bridge = { - name = mkOption { - default = "xenbr0"; - type = types.str; - description = '' - Name of bridge the Xen domUs connect to. - ''; - }; - - address = mkOption { - type = types.str; - default = "172.16.0.1"; - description = '' - IPv4 address of the bridge. - ''; - }; - - prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= 32); - default = 16; - description = '' - Subnet mask of the bridge interface, specified as the number of - bits in the prefix (`24`). - A DHCP server will provide IP addresses for the whole, remaining - subnet. - ''; - }; - - forwardDns = mkOption { - type = types.bool; - default = false; - description = '' - If set to `true`, the DNS queries from the - hosts connected to the bridge will be forwarded to the DNS - servers specified in /etc/resolv.conf . - ''; - }; - + maxMemory = lib.options.mkOption { + default = cfg.dom0Resources.memory; + defaultText = lib.options.literalExpression "config.virtualisation.xen.dom0Resources.memory"; + example = 1024; + type = lib.types.ints.unsigned; + description = '' + Maximum amount of memory (in MiB) that Domain 0 can + dynamically allocate to itself. Does nothing if set + to the same amount as virtualisation.xen.memory, or + if that option is set to 0. + ''; }; + }; - virtualisation.xen.stored = - mkOption { - type = types.path; - description = - '' - Xen Store daemon to use. Defaults to oxenstored of the xen package. - ''; + domains = { + extraConfig = lib.options.mkOption { + type = lib.types.lines; + default = ""; + example = '' + XENDOMAINS_SAVE=/persist/xen/save + XENDOMAINS_RESTORE=false + XENDOMAINS_CREATE_USLEEP=10000000 + ''; + description = '' + Options defined here will override the defaults for xendomains. + The default options can be seen in the file included from + /etc/default/xendomains. + ''; }; + }; - virtualisation.xen.domains = { - extraConfig = mkOption { - type = types.lines; - default = ""; - description = - '' - Options defined here will override the defaults for xendomains. - The default options can be seen in the file included from - /etc/default/xendomains. - ''; + store = { + path = lib.options.mkOption { + type = lib.types.path; + default = "${cfg.package}/bin/oxenstored"; + defaultText = lib.options.literalExpression "\${config.virtualisation.xen.package}/bin/oxenstored"; + example = lib.options.literalExpression "\${config.virtualisation.xen.package}/bin/xenstored"; + description = '' + Path to the Xen Store Daemon. This option is useful to + switch between the legacy C-based Xen Store Daemon, and + the newer OCaml-based Xen Store Daemon, `oxenstored`. + ''; + }; + type = lib.options.mkOption { + type = lib.types.enum [ + "c" + "ocaml" + ]; + default = if (lib.strings.hasSuffix "oxenstored" cfg.store.path) then "ocaml" else "c"; + internal = true; + readOnly = true; + description = "Helper internal option that determines the type of the Xen Store Daemon based on cfg.store.path."; + }; + settings = lib.options.mkOption { + default = { }; + example = { + enableMerge = false; + quota.maxWatchEvents = 2048; + quota.enable = true; + conflict.maxHistorySeconds = 0.12; + conflict.burstLimit = 15.0; + xenstored.log.file = "/dev/null"; + xenstored.log.level = "info"; + }; + description = '' + The OCaml-based Xen Store Daemon configuration. This + option does nothing with the C-based `xenstored`. + ''; + type = lib.types.submodule { + options = { + pidFile = lib.options.mkOption { + default = "/run/xen/xenstored.pid"; + example = "/var/run/xen/xenstored.pid"; + type = lib.types.path; + description = "Path to the Xen Store Daemon PID file."; + }; + testEAGAIN = lib.options.mkOption { + default = cfg.debug; + defaultText = lib.options.literalExpression "config.virtualisation.xen.debug"; + example = true; + type = lib.types.bool; + visible = false; + description = "Randomly fail a transaction with EAGAIN. This option is used for debugging purposes only."; + }; + enableMerge = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = "Whether to enable transaction merge support."; + }; + conflict = { + burstLimit = lib.options.mkOption { + default = 5.0; + example = 15.0; + type = lib.types.addCheck ( + lib.types.float + // { + name = "nonnegativeFloat"; + description = "nonnegative floating point number, meaning >=0"; + descriptionClass = "nonRestrictiveClause"; + } + ) (n: n >= 0); + description = '' + Limits applied to domains whose writes cause other domains' transaction + commits to fail. Must include decimal point. + + The burst limit is the number of conflicts a domain can cause to + fail in a short period; this value is used for both the initial and + the maximum value of each domain's conflict-credit, which falls by + one point for each conflict caused, and when it reaches zero the + domain's requests are ignored. + ''; + }; + maxHistorySeconds = lib.options.mkOption { + default = 5.0e-2; + example = 1.0; + type = lib.types.addCheck ( + lib.types.float // { description = "nonnegative floating point number, meaning >=0"; } + ) (n: n >= 0); + description = '' + Limits applied to domains whose writes cause other domains' transaction + commits to fail. Must include decimal point. + + The conflict-credit is replenished over time: + one point is issued after each conflict.maxHistorySeconds, so this + is the minimum pause-time during which a domain will be ignored. + ''; + }; + rateLimitIsAggregate = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = '' + If the conflict.rateLimitIsAggregate option is `true`, then after each + tick one point of conflict-credit is given to just one domain: the + one at the front of the queue. If `false`, then after each tick each + domain gets a point of conflict-credit. + + In environments where it is known that every transaction will + involve a set of nodes that is writable by at most one other domain, + then it is safe to set this aggregate limit flag to `false` for better + performance. (This can be determined by considering the layout of + the xenstore tree and permissions, together with the content of the + transactions that require protection.) + + A transaction which involves a set of nodes which can be modified by + multiple other domains can suffer conflicts caused by any of those + domains, so the flag must be set to `true`. + ''; + }; + }; + perms = { + enable = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = "Whether to enable the node permission system."; + }; + enableWatch = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = '' + Whether to enable the watch permission system. + + When this is set to `true`, unprivileged guests can only get watch events + for xenstore entries that they would've been able to read. + + When this is set to `false`, unprivileged guests may get watch events + for xenstore entries that they cannot read. The watch event contains + only the entry name, not the value. + This restores behaviour prior to [XSA-115](https://xenbits.xenproject.org/xsa/advisory-115.html). + ''; + }; + }; + quota = { + enable = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = "Whether to enable the quota system."; + }; + maxEntity = lib.options.mkOption { + default = 1000; + example = 1024; + type = lib.types.ints.positive; + description = "Entity limit for transactions."; + }; + maxSize = lib.options.mkOption { + default = 2048; + example = 4096; + type = lib.types.ints.positive; + description = "Size limit for transactions."; + }; + maxWatch = lib.options.mkOption { + default = 100; + example = 256; + type = lib.types.ints.positive; + description = "Maximum number of watches by the Xenstore Watchdog."; + }; + transaction = lib.options.mkOption { + default = 10; + example = 50; + type = lib.types.ints.positive; + description = "Maximum number of transactions."; + }; + maxRequests = lib.options.mkOption { + default = 1024; + example = 1024; + type = lib.types.ints.positive; + description = "Maximum number of requests per transaction."; + }; + maxPath = lib.options.mkOption { + default = 1024; + example = 1024; + type = lib.types.ints.positive; + description = "Path limit for the quota system."; + }; + maxOutstanding = lib.options.mkOption { + default = 1024; + example = 1024; + type = lib.types.ints.positive; + description = "Maximum outstanding requests, i.e. in-flight requests / domain."; + }; + maxWatchEvents = lib.options.mkOption { + default = 1024; + example = 2048; + type = lib.types.ints.positive; + description = "Maximum number of outstanding watch events per watch."; + }; + }; + persistent = lib.options.mkOption { + default = false; + example = true; + type = lib.types.bool; + description = "Whether to activate the filed base backend."; + }; + xenstored = { + log = { + file = lib.options.mkOption { + default = "/var/log/xen/xenstored.log"; + example = "/dev/null"; + type = lib.types.path; + description = "Path to the Xen Store log file."; + }; + level = lib.options.mkOption { + default = if cfg.trace then "debug" else null; + defaultText = lib.options.literalExpression "if (config.virtualisation.xen.trace == true) then \"debug\" else null"; + example = "error"; + type = lib.types.nullOr ( + lib.types.enum [ + "debug" + "info" + "warn" + "error" + ] + ); + description = "Logging level for the Xen Store."; + }; + # The hidden options below have no upstream documentation whatsoever. + # The nb* options appear to alter the log rotation behaviour, and + # the specialOps option appears to affect the Xenbus logging logic. + nbFiles = lib.options.mkOption { + default = 10; + example = 16; + type = lib.types.int; + visible = false; + description = "Set `xenstored-log-nb-files`."; + }; + }; + accessLog = { + file = lib.options.mkOption { + default = "/var/log/xen/xenstored-access.log"; + example = "/var/log/security/xenstored-access.log"; + type = lib.types.path; + description = "Path to the Xen Store access log file."; + }; + nbLines = lib.options.mkOption { + default = 13215; + example = 16384; + type = lib.types.int; + visible = false; + description = "Set `access-log-nb-lines`."; + }; + nbChars = lib.options.mkOption { + default = 180; + example = 256; + type = lib.types.int; + visible = false; + description = "Set `acesss-log-nb-chars`."; + }; + specialOps = lib.options.mkOption { + default = false; + example = true; + type = lib.types.bool; + visible = false; + description = "Set `access-log-special-ops`."; + }; + }; + xenfs = { + kva = lib.options.mkOption { + default = "/proc/xen/xsd_kva"; + example = cfg.store.settings.xenstored.xenfs.kva; + type = lib.types.path; + visible = false; + description = '' + Path to the Xen Store Daemon KVA location inside the XenFS pseudo-filesystem. + While it is possible to alter this value, some drivers may be hardcoded to follow the default paths. + ''; + }; + port = lib.options.mkOption { + default = "/proc/xen/xsd_port"; + example = cfg.store.settings.xenstored.xenfs.port; + type = lib.types.path; + visible = false; + description = '' + Path to the Xen Store Daemon userspace port inside the XenFS pseudo-filesystem. + While it is possible to alter this value, some drivers may be hardcoded to follow the default paths. + ''; + }; + }; + }; + ringScanInterval = lib.options.mkOption { + default = 20; + example = 30; + type = lib.types.addCheck ( + lib.types.int + // { + name = "nonzeroInt"; + description = "nonzero signed integer, meaning !=0"; + descriptionClass = "nonRestrictiveClause"; + } + ) (n: n != 0); + description = '' + Perodic scanning for all the rings as a safenet for lazy clients. + Define the interval in seconds; set to a negative integer to disable. + ''; + }; }; + }; }; - - virtualisation.xen.trace = mkEnableOption "Xen tracing"; - + }; }; + ## Implementation ## - ###### implementation + config = lib.modules.mkIf cfg.enable { + assertions = [ + { + assertion = pkgs.stdenv.isx86_64; + message = "Xen is currently not supported on ${pkgs.stdenv.hostPlatform.system}."; + } + { + assertion = + config.boot.loader.systemd-boot.enable + || (config.boot ? lanzaboote) && config.boot.lanzaboote.enable; + message = "Xen only supports booting on systemd-boot or Lanzaboote."; + } + { + assertion = config.boot.initrd.systemd.enable; + message = "Xen does not support the legacy script-based Stage 1 initrd."; + } + { + assertion = cfg.dom0Resources.maxMemory >= cfg.dom0Resources.memory; + message = '' + You have allocated more memory to dom0 than virtualisation.xen.dom0Resources.maxMemory + allows for. Please increase the maximum memory limit, or decrease the default memory allocation. + ''; + } + { + assertion = cfg.debug -> cfg.trace; + message = "Xen's debugging features are enabled, but logging is disabled. This is most likely not what you want."; + } + { + assertion = cfg.store.settings.quota.maxWatchEvents >= cfg.store.settings.quota.maxOutstanding; + message = '' + Upstream Xen recommends that maxWatchEvents be equal to or greater than maxOutstanding, + in order to mitigate denial of service attacks from malicious frontends. + ''; + } + ]; - config = mkIf cfg.enable { - assertions = [ { - assertion = pkgs.stdenv.isx86_64; - message = "Xen currently not supported on ${pkgs.stdenv.hostPlatform.system}"; - } { - assertion = config.boot.loader.grub.enable && (config.boot.loader.grub.efiSupport == false); - message = "Xen currently does not support EFI boot"; - } ]; + virtualisation.xen.bootParams = + lib.lists.optionals cfg.trace [ + "loglvl=all" + "guest_loglvl=all" + ] + ++ + lib.lists.optional (cfg.dom0Resources.memory != 0) + "dom0_mem=${toString cfg.dom0Resources.memory}M${ + lib.strings.optionalString ( + cfg.dom0Resources.memory != cfg.dom0Resources.maxMemory + ) ",max:${toString cfg.dom0Resources.maxMemory}M" + }" + ++ lib.lists.optional ( + cfg.dom0Resources.maxVCPUs != 0 + ) "dom0_max_vcpus=${toString cfg.dom0Resources.maxVCPUs}"; - virtualisation.xen.package = mkDefault pkgs.xen; - virtualisation.xen.package-qemu = mkDefault pkgs.xen; - virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; - - environment.systemPackages = [ cfg.package ]; - - boot.kernelModules = - [ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback" - "xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk" - "usbbk" "pciback" "xen-acpi-processor" "blktap2" "tun" "netxen_nic" - "xen_wdt" "xen-acpi-processor" "xen-privcmd" "xen-scsiback" + boot = { + kernelModules = [ + "xen-evtchn" + "xen-gntdev" + "xen-gntalloc" + "xen-blkback" + "xen-netback" + "xen-pciback" + "evtchn" + "gntdev" + "netbk" + "blkbk" + "xen-scsibk" + "usbbk" + "pciback" + "xen-acpi-processor" + "blktap2" + "tun" + "netxen_nic" + "xen_wdt" + "xen-acpi-processor" + "xen-privcmd" + "xen-scsiback" "xenfs" ]; - # The xenfs module is needed in system.activationScripts.xen, but - # the modprobe command there fails silently. Include xenfs in the - # initrd as a work around. - boot.initrd.kernelModules = [ "xenfs" ]; + # The xenfs module is needed to mount /proc/xen. + initrd.kernelModules = [ "xenfs" ]; - # The radeonfb kernel module causes the screen to go black as soon - # as it's loaded, so don't load it. - boot.blacklistedKernelModules = [ "radeonfb" ]; - - # Increase the number of loopback devices from the default (8), - # which is way too small because every VM virtual disk requires a - # loopback device. - boot.extraModprobeConfig = - '' + # Increase the number of loopback devices from the default (8), + # which is way too small because every VM virtual disk requires a + # loopback device. + extraModprobeConfig = '' options loop max_loop=64 ''; - virtualisation.xen.bootParams = [] ++ - optionals cfg.trace [ "loglvl=all" "guest_loglvl=all" ] ++ - optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M"; + # Xen Bootspec extension. This extension allows NixOS bootloaders to + # fetch the `xen.efi` path and access the `cfg.bootParams` option. + bootspec.extensions = { + "org.xenproject.bootspec.v1" = { + xen = cfg.efi.path; + xenParams = cfg.bootParams; + }; + }; - system.extraSystemBuilderCmds = - '' - ln -s ${cfg.package}/boot/xen.gz $out/xen.gz - echo "${toString cfg.bootParams}" > $out/xen-params - ''; - - # Mount the /proc/xen pseudo-filesystem. - system.activationScripts.xen = - '' - if [ -d /proc/xen ]; then - ${pkgs.kmod}/bin/modprobe xenfs 2> /dev/null - ${pkgs.util-linux}/bin/mountpoint -q /proc/xen || \ - ${pkgs.util-linux}/bin/mount -t xenfs none /proc/xen - fi + # See the `xenBootBuilder` script in the main `let...in` statement of this file. + loader.systemd-boot.extraInstallCommands = '' + ${lib.meta.getExe xenBootBuilder} ${cfg.efi.bootBuilderVerbosity} ''; + }; # Domain 0 requires a pvops-enabled kernel. - system.requiredKernelConfig = with config.lib.kernelConfig; - [ (isYes "XEN") - (isYes "X86_IO_APIC") - (isYes "ACPI") - (isYes "XEN_DOM0") - (isYes "PCI_XEN") - (isYes "XEN_DEV_EVTCHN") - (isYes "XENFS") - (isYes "XEN_COMPAT_XENFS") - (isYes "XEN_SYS_HYPERVISOR") - (isYes "XEN_GNTDEV") - (isYes "XEN_BACKEND") - (isModule "XEN_NETDEV_BACKEND") - (isModule "XEN_BLKDEV_BACKEND") - (isModule "XEN_PCIDEV_BACKEND") - (isYes "XEN_BALLOON") - (isYes "XEN_SCRUB_PAGES") + # All NixOS kernels come with this enabled by default; this is merely a sanity check. + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "XEN") + (isYes "X86_IO_APIC") + (isYes "ACPI") + (isYes "XEN_DOM0") + (isYes "PCI_XEN") + (isYes "XEN_DEV_EVTCHN") + (isYes "XENFS") + (isYes "XEN_COMPAT_XENFS") + (isYes "XEN_SYS_HYPERVISOR") + (isYes "XEN_GNTDEV") + (isYes "XEN_BACKEND") + (isModule "XEN_NETDEV_BACKEND") + (isModule "XEN_BLKDEV_BACKEND") + (isModule "XEN_PCIDEV_BACKEND") + (isYes "XEN_BALLOON") + (isYes "XEN_SCRUB_PAGES") + ]; + + environment = { + systemPackages = [ + cfg.package + cfg.qemu.package ]; + etc = + # Set up Xen Domain 0 configuration files. + { + "xen/xl.conf".source = "${cfg.package}/etc/xen/xl.conf"; # TODO: Add options to configure xl.conf declaratively. It's worth considering making a new "xl value" type, as it could be reused to produce xl.cfg (domain definition) files. + "xen/scripts-xen" = { + source = "${cfg.package}/etc/xen/scripts/*"; + target = "xen/scripts"; + }; + "default/xencommons".text = '' + source ${cfg.package}/etc/default/xencommons + XENSTORED="${cfg.store.path}" + QEMU_XEN="${cfg.qemu.package}/${cfg.qemu.package.qemu-system-i386}" + ${lib.strings.optionalString cfg.trace '' + XENSTORED_TRACE=yes + XENCONSOLED_TRACE=all + ''} + ''; + "default/xendomains".text = '' + source ${cfg.package}/etc/default/xendomains - environment.etc = - { - "xen/xl.conf".source = "${cfg.package}/etc/xen/xl.conf"; - "xen/scripts".source = "${cfg.package}/etc/xen/scripts"; - "default/xendomains".text = '' - source ${cfg.package}/etc/default/xendomains - - ${cfg.domains.extraConfig} - ''; - } - // optionalAttrs (builtins.compareVersions cfg.package.version "4.10" >= 0) { - # in V 4.10 oxenstored requires /etc/xen/oxenstored.conf to start - "xen/oxenstored.conf".source = "${cfg.package}/etc/xen/oxenstored.conf"; - }; + ${cfg.domains.extraConfig} + ''; + } + # The OCaml-based Xen Store Daemon requires /etc/xen/oxenstored.conf to start. + // lib.attrsets.optionalAttrs (cfg.store.type == "ocaml") { + "xen/oxenstored.conf".text = '' + pid-file = ${cfg.store.settings.pidFile} + test-eagain = ${lib.trivial.boolToString cfg.store.settings.testEAGAIN} + merge-activate = ${toString cfg.store.settings.enableMerge} + conflict-burst-limit = ${toString cfg.store.settings.conflict.burstLimit} + conflict-max-history-seconds = ${toString cfg.store.settings.conflict.maxHistorySeconds} + conflict-rate-limit-is-aggregate = ${toString cfg.store.settings.conflict.rateLimitIsAggregate} + perms-activate = ${toString cfg.store.settings.perms.enable} + perms-watch-activate = ${toString cfg.store.settings.perms.enableWatch} + quota-activate = ${toString cfg.store.settings.quota.enable} + quota-maxentity = ${toString cfg.store.settings.quota.maxEntity} + quota-maxsize = ${toString cfg.store.settings.quota.maxSize} + quota-maxwatch = ${toString cfg.store.settings.quota.maxWatch} + quota-transaction = ${toString cfg.store.settings.quota.transaction} + quota-maxrequests = ${toString cfg.store.settings.quota.maxRequests} + quota-path-max = ${toString cfg.store.settings.quota.maxPath} + quota-maxoutstanding = ${toString cfg.store.settings.quota.maxOutstanding} + quota-maxwatchevents = ${toString cfg.store.settings.quota.maxWatchEvents} + persistent = ${lib.trivial.boolToString cfg.store.settings.persistent} + xenstored-log-file = ${cfg.store.settings.xenstored.log.file} + xenstored-log-level = ${ + if isNull cfg.store.settings.xenstored.log.level then + "null" + else + cfg.store.settings.xenstored.log.level + } + xenstored-log-nb-files = ${toString cfg.store.settings.xenstored.log.nbFiles} + access-log-file = ${cfg.store.settings.xenstored.accessLog.file} + access-log-nb-lines = ${toString cfg.store.settings.xenstored.accessLog.nbLines} + acesss-log-nb-chars = ${toString cfg.store.settings.xenstored.accessLog.nbChars} + access-log-special-ops = ${lib.trivial.boolToString cfg.store.settings.xenstored.accessLog.specialOps} + ring-scan-interval = ${toString cfg.store.settings.ringScanInterval} + xenstored-kva = ${cfg.store.settings.xenstored.xenfs.kva} + xenstored-port = ${cfg.store.settings.xenstored.xenfs.port} + ''; + }; + }; # Xen provides udev rules. services.udev.packages = [ cfg.package ]; - services.udev.path = [ pkgs.bridge-utils pkgs.iproute2 ]; + systemd = { + # Xen provides systemd units. + packages = [ cfg.package ]; - systemd.services.xen-store = { - description = "Xen Store Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "xen-store.socket" ]; - requires = [ "xen-store.socket" ]; - preStart = '' - export XENSTORED_ROOTDIR="/var/lib/xenstored" - rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + mounts = [ + { + description = "Mount /proc/xen files"; + what = "xenfs"; + where = "/proc/xen"; + type = "xenfs"; + unitConfig = { + ConditionPathExists = "/proc/xen"; + RefuseManualStop = "true"; + }; + } + ]; - mkdir -p /var/run - mkdir -p /var/log/xen # Running xl requires /var/log/xen and /var/lib/xen, - mkdir -p /var/lib/xen # so we create them here unconditionally. - grep -q control_d /proc/xen/capabilities - ''; - serviceConfig = if (builtins.compareVersions cfg.package.version "4.8" < 0) then - { ExecStart = '' - ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork - ''; - } else { - ExecStart = '' - ${cfg.package}/etc/xen/scripts/launch-xenstore - ''; - Type = "notify"; - RemainAfterExit = true; - NotifyAccess = "all"; - }; - postStart = '' - ${optionalString (builtins.compareVersions cfg.package.version "4.8" < 0) '' - time=0 - timeout=30 - # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do - time=$(($time+1)) - sleep 1 - done + services = { - # Exit if we timed out - if ! [ $time -lt $timeout ] ; then - echo "Could not start Xenstore Daemon" - exit 1 - fi - ''} - echo "executing xen-init-dom0" - ${cfg.package}/lib/xen/bin/xen-init-dom0 - ''; - }; + # While this service is installed by the `xen` package, it shouldn't be used in dom0. + xendriverdomain.enable = false; - systemd.sockets.xen-store = { - description = "XenStore Socket for userspace API"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = [ "/var/run/xenstored/socket" "/var/run/xenstored/socket_ro" ]; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "root"; - }; - }; - - - systemd.services.xen-console = { - description = "Xen Console Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-store.service" ]; - requires = [ "xen-store.service" ]; - preStart = '' - mkdir -p /var/run/xen - ${optionalString cfg.trace "mkdir -p /var/log/xen"} - grep -q control_d /proc/xen/capabilities - ''; - serviceConfig = { - ExecStart = '' - ${cfg.package}/bin/xenconsoled\ - ${optionalString ((builtins.compareVersions cfg.package.version "4.8" >= 0)) " -i"}\ - ${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} + xenstored = { + wantedBy = [ "multi-user.target" ]; + preStart = '' + export XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + mkdir -p /var/{run,log,lib}/xen ''; + }; + + xen-init-dom0 = { + restartIfChanged = false; + wantedBy = [ "multi-user.target" ]; + }; + + xen-qemu-dom0-disk-backend = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + PIDFile = cfg.qemu.pidFile; + ExecStart = '' + ${cfg.qemu.package}/${cfg.qemu.package.qemu-system-i386} \ + -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv \ + -daemonize -monitor /dev/null -serial /dev/null -parallel \ + /dev/null -nodefaults -no-user-config -pidfile \ + ${cfg.qemu.pidFile} + ''; + }; + }; + + xenconsoled.wantedBy = [ "multi-user.target" ]; + + xen-watchdog = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + RestartSec = "1"; + Restart = "on-failure"; + }; + }; + + xendomains = { + restartIfChanged = false; + path = [ + cfg.package + cfg.qemu.package + ]; + preStart = "mkdir -p /var/lock/subsys -m 755"; + wantedBy = [ "multi-user.target" ]; + }; }; }; - - - systemd.services.xen-qemu = { - description = "Xen Qemu Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-console.service" ]; - requires = [ "xen-store.service" ]; - serviceConfig.ExecStart = '' - ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \ - -xen-attach -xen-domid 0 -name dom0 -M xenpv \ - -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null - ''; - }; - - - systemd.services.xen-watchdog = { - description = "Xen Watchdog Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-qemu.service" "xen-domains.service" ]; - serviceConfig.ExecStart = "${cfg.package}/bin/xenwatchdogd 30 15"; - serviceConfig.Type = "forking"; - serviceConfig.RestartSec = "1"; - serviceConfig.Restart = "on-failure"; - }; - - - systemd.services.xen-bridge = { - description = "Xen bridge"; - wantedBy = [ "multi-user.target" ]; - before = [ "xen-domains.service" ]; - preStart = '' - mkdir -p /var/run/xen - touch /var/run/xen/dnsmasq.pid - touch /var/run/xen/dnsmasq.etherfile - touch /var/run/xen/dnsmasq.leasefile - - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Usable\ range` - export XEN_BRIDGE_IP_RANGE_START="${"\${data[1]//[[:blank:]]/}"}" - export XEN_BRIDGE_IP_RANGE_END="${"\${data[2]//[[:blank:]]/}"}" - - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address` - export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}" - - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ mask` - export XEN_BRIDGE_NETMASK="${"\${data[1]//[[:blank:]]/}"}" - - echo "${cfg.bridge.address} host gw dns" > /var/run/xen/dnsmasq.hostsfile - - cat < /var/run/xen/dnsmasq.conf - no-daemon - pid-file=/var/run/xen/dnsmasq.pid - interface=${cfg.bridge.name} - except-interface=lo - bind-interfaces - auth-zone=xen.local,$XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} - domain=xen.local - addn-hosts=/var/run/xen/dnsmasq.hostsfile - expand-hosts - strict-order - no-hosts - bogus-priv - ${optionalString (!cfg.bridge.forwardDns) '' - no-resolv - no-poll - auth-server=dns.xen.local,${cfg.bridge.name} - ''} - filterwin2k - clear-on-reload - domain-needed - dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile - dhcp-authoritative - dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END - dhcp-no-override - no-ping - dhcp-leasefile=/var/run/xen/dnsmasq.leasefile - EOF - - # DHCP - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - # DNS - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - - ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name} - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address} - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} netmask $XEN_BRIDGE_NETMASK - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} up - ''; - serviceConfig.ExecStart = "${pkgs.dnsmasq}/bin/dnsmasq --conf-file=/var/run/xen/dnsmasq.conf"; - postStop = '' - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address` - export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}" - - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} down - ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge.name} - - # DNS - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - # DHCP - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ''; - }; - - - systemd.services.xen-domains = { - description = "Xen domains - automatically starts, saves and restores Xen domains"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-bridge.service" "xen-qemu.service" ]; - requires = [ "xen-bridge.service" "xen-qemu.service" ]; - ## To prevent a race between dhcpcd and xend's bridge setup script - ## (which renames eth* to peth* and recreates eth* as a virtual - ## device), start dhcpcd after xend. - before = [ "dhcpd.service" ]; - restartIfChanged = false; - serviceConfig.RemainAfterExit = "yes"; - path = [ cfg.package cfg.package-qemu ]; - environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains"; - preStart = "mkdir -p /var/lock/subsys -m 755"; - serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start"; - serviceConfig.ExecStop = "${cfg.package}/etc/init.d/xendomains stop"; - }; - }; + meta.maintainers = with lib.maintainers; [ sigmasquadron ]; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 22bedb8d8269..db24053e849a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -685,7 +685,7 @@ in { nix-misc = handleTest ./nix/misc.nix {}; nix-upgrade = handleTest ./nix/upgrade.nix {inherit (pkgs) nixVersions;}; nix-required-mounts = runTest ./nix-required-mounts; - nix-serve = handleTest ./nix-serve.nix {}; + nix-serve = runTest ./nix-serve.nix; nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; diff --git a/nixos/tests/nix-serve.nix b/nixos/tests/nix-serve.nix index 3aa913f81107..c41bc505e963 100644 --- a/nixos/tests/nix-serve.nix +++ b/nixos/tests/nix-serve.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +{ config, ... }: { name = "nix-serve"; nodes.machine = { pkgs, ... }: { @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: }; testScript = let pkgHash = builtins.head ( - builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello) + builtins.match "${builtins.storeDir}/([^-]+).+" (toString config.node.pkgs.hello) ); in '' start_all() @@ -19,4 +19,4 @@ import ./make-test-python.nix ({ pkgs, ... }: "curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar" ) ''; -}) +} diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index e3cf437258df..ca43d76b5581 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.13"; + version = "0.3.15"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080="; + hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U="; }; - cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM="; + cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index c65961b275d6..df04ceaf2c75 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -46,6 +46,20 @@ lib.makeScope pkgs.newScope (self: withPgtk = true; }; + emacs30 = callPackage (self.sources.emacs30) inheritedArgs; + + emacs30-gtk3 = self.emacs30.override { + withGTK3 = true; + }; + + emacs30-nox = self.emacs30.override { + noGui = true; + }; + + emacs30-pgtk = self.emacs30.override { + withPgtk = true; + }; + emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index ad77abc0c44f..26e5346e0123 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -75,6 +75,8 @@ , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets) , withGpm ? stdenv.isLinux , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) +# Emacs 30+ has native JSON support +, withJansson ? lib.versionOlder version "30" , withMailutils ? true , withMotif ? false , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) @@ -157,7 +159,9 @@ mkDerivation (finalAttrs: { (substituteAll { src = if lib.versionOlder finalAttrs.version "29" then ./native-comp-driver-options-28.patch - else ./native-comp-driver-options.patch; + else if lib.versionOlder finalAttrs.version "30" + then ./native-comp-driver-options.patch + else ./native-comp-driver-options-30.patch; backendPath = (lib.concatStringsSep " " (builtins.map (x: ''"-B${x}"'') ([ # Paths necessary so the JIT compiler finds its libraries: @@ -212,13 +216,15 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals srcRepo [ autoreconfHook texinfo - ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3; + ] ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ]; buildInputs = [ gettext gnutls - harfbuzz.dev + (lib.getDev harfbuzz) + ] ++ lib.optionals withJansson [ jansson + ] ++ [ libxml2 ncurses ] ++ lib.optionals withAcl [ diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch new file mode 100644 index 000000000000..bd3ff2adf77c --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch @@ -0,0 +1,16 @@ +diff -Naur a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +--- old/lisp/emacs-lisp/comp.el 1969-12-31 21:00:01.000000000 -0300 ++++ source/lisp/emacs-lisp/comp.el 2024-09-13 14:26:37.246614196 -0300 +@@ -101,8 +101,10 @@ + :version "28.1") + + (defcustom native-comp-driver-options +- (cond ((eq system-type 'darwin) '("-Wl,-w")) +- ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++ (append ++ (cond ((eq system-type 'darwin) '("-Wl,-w")) ++ ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++ '(@backendPath@)) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index da243044b689..ae93a2ed019a 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -110,6 +110,14 @@ in hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s="; }); + emacs30 = import ./make-emacs.nix (mkArgs { + pname = "emacs"; + version = "30.0.91"; + variant = "mainline"; + rev = "30.0.91"; + hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ="; + }); + emacs28-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; version = "28.2"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8cb9f69f46d4..91c4aaf05ad9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6363,6 +6363,354 @@ final: prev: meta.homepage = "https://github.com/hadronized/mind.nvim/"; }; + mini-git = buildVimPlugin { + pname = "mini-git"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini-git"; + rev = "25651b097bedf519421f9744cdc91a693dfa463a"; + sha256 = "0535awbbl8hxyi41iwj5w44jajvjiys28z2qgs1fczsgwbpwx6z1"; + }; + meta.homepage = "https://github.com/echasnovski/mini-git/"; + }; + + mini-ai = buildVimPlugin { + pname = "mini.ai"; + version = "2024-08-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.ai"; + rev = "a9b992b13d22a8db8df6beac25afa59a10b5584d"; + sha256 = "12a9xyd3gj9qvll1fj4kv4cdv4jz1sfaxp176c73f2hlv4w4p6ri"; + }; + meta.homepage = "https://github.com/echasnovski/mini.ai/"; + }; + + mini-align = buildVimPlugin { + pname = "mini.align"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.align"; + rev = "b54d88b16bfac62ca6b3d699566135639a3ca4fa"; + sha256 = "1llrq86hbx299zbzfr04yrylrf5cqgpzanhiahb0mq3y5z0fpvcx"; + }; + meta.homepage = "https://github.com/echasnovski/mini.align/"; + }; + + mini-animate = buildVimPlugin { + pname = "mini.animate"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.animate"; + rev = "320fb35460238c436407cd779f63abad98e84870"; + sha256 = "1ksaln0r5lm5w4rxccbb4b3yz0ycgv67brbcnbkz2aifva1pza9y"; + }; + meta.homepage = "https://github.com/echasnovski/mini.animate/"; + }; + + mini-base16 = buildVimPlugin { + pname = "mini.base16"; + version = "2024-08-16"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.base16"; + rev = "b434a7c03f1c3581bed8c17dbc512168920de5c6"; + sha256 = "04lfciwlmrdzn58c49yshva6xyr46f4imnp4dh408cvdnw0j5yqv"; + }; + meta.homepage = "https://github.com/echasnovski/mini.base16/"; + }; + + mini-basics = buildVimPlugin { + pname = "mini.basics"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.basics"; + rev = "1af88d68b9d9c8cbf0dde9bd7ad510b93eafd9aa"; + sha256 = "0iynhxwc029lg62c3xfydpnnin2gnr4sbrxja4dj02j544y2kyss"; + }; + meta.homepage = "https://github.com/echasnovski/mini.basics/"; + }; + + mini-bracketed = buildVimPlugin { + pname = "mini.bracketed"; + version = "2024-08-13"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.bracketed"; + rev = "072d50801d8d4aaeb4b9765fa35c61639e0cff6b"; + sha256 = "047hcwcp8lms3zhvbckq2cqs9ir9g4z3i0lmf1qrd807aqih7fxp"; + }; + meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; + }; + + mini-bufremove = buildVimPlugin { + pname = "mini.bufremove"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.bufremove"; + rev = "1ee294a97e091d3cf967974df622c0d887890dc2"; + sha256 = "0jhhh2f4zzbixcqbp7540bzgbzgwwipi37knqj1ykpf5py4kp0dm"; + }; + meta.homepage = "https://github.com/echasnovski/mini.bufremove/"; + }; + + mini-clue = buildVimPlugin { + pname = "mini.clue"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.clue"; + rev = "847376b3a044129348cea9eedb841106379e0796"; + sha256 = "19bzb4hawll898dr4w53jhy9h56dnf4c3cjisqlyjh3qgl0h588s"; + }; + meta.homepage = "https://github.com/echasnovski/mini.clue/"; + }; + + mini-colors = buildVimPlugin { + pname = "mini.colors"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.colors"; + rev = "9fa904dd46da5d84028478b9cc689be021732fab"; + sha256 = "1n81am3b3lphq75vs3fwwl14ajk58hqr5znjd4dbcdpr7mz94bzc"; + }; + meta.homepage = "https://github.com/echasnovski/mini.colors/"; + }; + + mini-comment = buildVimPlugin { + pname = "mini.comment"; + version = "2024-07-21"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.comment"; + rev = "03c13e37318bdb18481311c0ac1adc9ed731caf1"; + sha256 = "0hdi07c704jx5a7fbxziw8rqmzm5hx66gj04jpzwgqs1c3hchppf"; + }; + meta.homepage = "https://github.com/echasnovski/mini.comment/"; + }; + + mini-completion = buildVimPlugin { + pname = "mini.completion"; + version = "2024-07-30"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.completion"; + rev = "ad99bbe569aa5ceb70c2ff4c36368f94a89496c5"; + sha256 = "0w9hgf4fq8plbns1fnq283s2difg9np8k8888fryd97yd3nys4pd"; + }; + meta.homepage = "https://github.com/echasnovski/mini.completion/"; + }; + + mini-cursorword = buildVimPlugin { + pname = "mini.cursorword"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.cursorword"; + rev = "7a9f1ec73c52124abc39f0309d332ababefc68b2"; + sha256 = "1wwwila2k8yap1k6v2ndzqylaw49pw1wk1l011pi12hcaimixba5"; + }; + meta.homepage = "https://github.com/echasnovski/mini.cursorword/"; + }; + + mini-deps = buildVimPlugin { + pname = "mini.deps"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.deps"; + rev = "dbee3da96d3cf68ff311d8f324a9b236a08ad429"; + sha256 = "1plgz5fssa4yczr32h230kn65dldi729sjrlxp4x9307n3s80zk1"; + }; + meta.homepage = "https://github.com/echasnovski/mini.deps/"; + }; + + mini-diff = buildVimPlugin { + pname = "mini.diff"; + version = "2024-07-11"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.diff"; + rev = "d58f9cb13400aedc5b5a0ef70fcdf31871ba2ee6"; + sha256 = "09qg43c3qwk0csqlvy9c7s3l9anp4pg0jrrzv8idvii3za2zrwsq"; + }; + meta.homepage = "https://github.com/echasnovski/mini.diff/"; + }; + + mini-doc = buildVimPlugin { + pname = "mini.doc"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.doc"; + rev = "bb73a3d1ff390f7e2740027ea2567017099a237c"; + sha256 = "1jsamvgdk6zxaimn9v949gbghf92d0ii8jhn2sjjy7arbl8w0w23"; + }; + meta.homepage = "https://github.com/echasnovski/mini.doc/"; + }; + + mini-extra = buildVimPlugin { + pname = "mini.extra"; + version = "2024-08-17"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.extra"; + rev = "05ddb1e3056c5ab541477a38d2c61d96d19fd299"; + sha256 = "0z0lsgsmjchc0arspzm04p5vfd5mdc3lyx4d4qibsxq5i0834r6y"; + }; + meta.homepage = "https://github.com/echasnovski/mini.extra/"; + }; + + mini-files = buildVimPlugin { + pname = "mini.files"; + version = "2024-08-17"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.files"; + rev = "170d0dd321ca377cb427fb5576d4d75601c1c2da"; + sha256 = "14p5syc4w43mgp522zj6hwpri4a49zkq36in3sifmr6h8bwhx87g"; + }; + meta.homepage = "https://github.com/echasnovski/mini.files/"; + }; + + mini-fuzzy = buildVimPlugin { + pname = "mini.fuzzy"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.fuzzy"; + rev = "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d"; + sha256 = "10ng6rq4ig0ijvbj2bbm428dg3asf40x9b7dsvndk33ikfrlbazz"; + }; + meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; + }; + + mini-hipatterns = buildVimPlugin { + pname = "mini.hipatterns"; + version = "2024-07-23"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.hipatterns"; + rev = "1811b0661721285fc83494d2e687d538fb3ddac8"; + sha256 = "0b8sswy6533rifxgfy52mssdbxrds8p0xxp8981q97pp0z64k2yq"; + }; + meta.homepage = "https://github.com/echasnovski/mini.hipatterns/"; + }; + + mini-hues = buildVimPlugin { + pname = "mini.hues"; + version = "2024-08-16"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.hues"; + rev = "0e46bdc04d3df4185097ecff08ad208868572b98"; + sha256 = "0s71n5mh49jvkzwamm7hnrrq39qlhhnpdg6l2x87mnyq5c0f8cvs"; + }; + meta.homepage = "https://github.com/echasnovski/mini.hues/"; + }; + + mini-icons = buildVimPlugin { + pname = "mini.icons"; + version = "2024-07-30"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.icons"; + rev = "fe63fe080e76d80713557e5f0c65bc15b14b152d"; + sha256 = "0z6jmrn5gf6c51dlnc7qwab8xg1dv1f5d5vmkmy8x2d6iapnlyqv"; + }; + meta.homepage = "https://github.com/echasnovski/mini.icons/"; + }; + + mini-indentscope = buildVimPlugin { + pname = "mini.indentscope"; + version = "2024-08-12"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.indentscope"; + rev = "d2e7b5f0260789c325f92ab3421ff9884ea01842"; + sha256 = "1w49n9nv32h70wf8ahya9xj1hfcxnx3bqxwpkhhz8ck95c84mmaa"; + }; + meta.homepage = "https://github.com/echasnovski/mini.indentscope/"; + }; + + mini-jump = buildVimPlugin { + pname = "mini.jump"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.jump"; + rev = "795f26e6640589382c277cffa494bda0a127bef4"; + sha256 = "0s51zsy0cm9bldxzzk5hnvqhccv9nh53qd07dlijd5403vsx77wa"; + }; + meta.homepage = "https://github.com/echasnovski/mini.jump/"; + }; + + mini-jump2d = buildVimPlugin { + pname = "mini.jump2d"; + version = "2024-07-18"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.jump2d"; + rev = "f39cc3eed3163799730166ac9cf382d44ce7159f"; + sha256 = "1bz2ymhvib10mb5cc8410yssi7k72hqs80n708p0dm3lyy3lw83w"; + }; + meta.homepage = "https://github.com/echasnovski/mini.jump2d/"; + }; + + mini-map = buildVimPlugin { + pname = "mini.map"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.map"; + rev = "290c3da965196d64f87050a076de9787a136e57a"; + sha256 = "09i26nh398i098lqsqajkjpr94762x54vnqlkcvbg5ak1fx3rajr"; + }; + meta.homepage = "https://github.com/echasnovski/mini.map/"; + }; + + mini-misc = buildVimPlugin { + pname = "mini.misc"; + version = "2024-08-18"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.misc"; + rev = "e51fa9430a4e18679d8b913ed2441182b5da2176"; + sha256 = "0r5kz4835srl8vgq8bhfx6qsqap6cbxnyk7247m5qy1j1hqdgchx"; + }; + meta.homepage = "https://github.com/echasnovski/mini.misc/"; + }; + + mini-move = buildVimPlugin { + pname = "mini.move"; + version = "2024-08-15"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.move"; + rev = "4caa1c212f5ca3d1633d21cfb184808090ed74b1"; + sha256 = "0f4nrg9n8air507h6bd61dmb1rjjhykyl36qgr0ai72cb011wzcx"; + }; + meta.homepage = "https://github.com/echasnovski/mini.move/"; + }; + + mini-notify = buildVimPlugin { + pname = "mini.notify"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.notify"; + rev = "a6101a5fa7eff7bdfbfc887ad9a331305729f0ec"; + sha256 = "1xkls37g2a6wfiyhhgaw0hzdrj602j1iv55b1a1l3pcj81w9p23l"; + }; + meta.homepage = "https://github.com/echasnovski/mini.notify/"; + }; + mini-nvim = buildVimPlugin { pname = "mini.nvim"; version = "2024-09-10"; @@ -6375,6 +6723,150 @@ final: prev: meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; + mini-operators = buildVimPlugin { + pname = "mini.operators"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.operators"; + rev = "7d30c0bc5baaa1f0d3a63dd18b35c8581bc164f4"; + sha256 = "0zghwk8rs7n9sgpssb2fbyrm8vnynwqa6ins2mshsirvmrbkz30z"; + }; + meta.homepage = "https://github.com/echasnovski/mini.operators/"; + }; + + mini-pairs = buildVimPlugin { + pname = "mini.pairs"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.pairs"; + rev = "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51"; + sha256 = "1016q19ndmzmbdaxi40w6wskhf91nc5qzbza6hyvcxdfpd81rl6q"; + }; + meta.homepage = "https://github.com/echasnovski/mini.pairs/"; + }; + + mini-pick = buildVimPlugin { + pname = "mini.pick"; + version = "2024-08-17"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.pick"; + rev = "2f0bdb96a3a1ef2a31a731e03b51fa97074df0d2"; + sha256 = "0ypz1zj3xpfwhx712i6dcwklmjriqbbg0kcq3zih1c3sz5la708m"; + }; + meta.homepage = "https://github.com/echasnovski/mini.pick/"; + }; + + mini-sessions = buildVimPlugin { + pname = "mini.sessions"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.sessions"; + rev = "3c80dcf01d9901ff3e4a40328bee8a44c65718b2"; + sha256 = "07kjgr31yd1kjlxhkaq3dy879s40c5zj89zjlxpspw0x49m167f8"; + }; + meta.homepage = "https://github.com/echasnovski/mini.sessions/"; + }; + + mini-splitjoin = buildVimPlugin { + pname = "mini.splitjoin"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.splitjoin"; + rev = "3e92f6764e770ba392325cad3a4497adcada695f"; + sha256 = "126z8rsyg3849ijix1siwq77f9slwr93l61rwg499flzja3incic"; + }; + meta.homepage = "https://github.com/echasnovski/mini.splitjoin/"; + }; + + mini-starter = buildVimPlugin { + pname = "mini.starter"; + version = "2024-07-02"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.starter"; + rev = "394994b2bec10a997c69575825d5c444957b9ff9"; + sha256 = "003fas6clkpql54w3lfqd088cy5cvd2iisl88adv54p3bfasppsp"; + }; + meta.homepage = "https://github.com/echasnovski/mini.starter/"; + }; + + mini-statusline = buildVimPlugin { + pname = "mini.statusline"; + version = "2024-08-12"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.statusline"; + rev = "85014aa9e4afe9a3ff1896ad768bf09584bff574"; + sha256 = "0aqf3wh0ibr4m9jjpi4p7vdfwc0knlm83axzlisy78x25xviks04"; + }; + meta.homepage = "https://github.com/echasnovski/mini.statusline/"; + }; + + mini-surround = buildVimPlugin { + pname = "mini.surround"; + version = "2024-08-17"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.surround"; + rev = "d8913ed23be0a1a4585ae34414821cc343a46174"; + sha256 = "182v214d8in864i3yirs7vg5lxb2kibfxpdh9cap14hbj4nbc6mi"; + }; + meta.homepage = "https://github.com/echasnovski/mini.surround/"; + }; + + mini-tabline = buildVimPlugin { + pname = "mini.tabline"; + version = "2024-08-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.tabline"; + rev = "27c38016a28b0efc375bbe11593391ca337849c1"; + sha256 = "0sxkyyb1igysj5n1cwa43m15dk307nj5d6njd93dmyrsawl4p0pw"; + }; + meta.homepage = "https://github.com/echasnovski/mini.tabline/"; + }; + + mini-test = buildVimPlugin { + pname = "mini.test"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.test"; + rev = "64bdbf6517032d29aab74525e212023631295a2f"; + sha256 = "02a6064sqdaajz99ga7sw7ijljlxjdd7v7i33razw2y3n5mx5f5d"; + }; + meta.homepage = "https://github.com/echasnovski/mini.test/"; + }; + + mini-trailspace = buildVimPlugin { + pname = "mini.trailspace"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.trailspace"; + rev = "c48d74a3cecf93f5adc6a7518c7ced60e6302895"; + sha256 = "0cywnra2v7hi76n3004wpv8r0w5qdpzwdmjrc21jv7hljq5q7av5"; + }; + meta.homepage = "https://github.com/echasnovski/mini.trailspace/"; + }; + + mini-visits = buildVimPlugin { + pname = "mini.visits"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.visits"; + rev = "76646d885b3700d594a8c4e6bca24b8cb79ff07f"; + sha256 = "0s4936yvjkv8l7hzzr8gs63h3a8f26y9lw2ibfn1fdyvpdp7nndk"; + }; + meta.homepage = "https://github.com/echasnovski/mini.visits/"; + }; + minimap-vim = buildVimPlugin { pname = "minimap.vim"; version = "2024-03-17"; @@ -10811,6 +11303,18 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; + syntax-tree-surfer = buildVimPlugin { + pname = "syntax-tree-surfer"; + version = "2023-10-06"; + src = fetchFromGitHub { + owner = "ziontee113"; + repo = "syntax-tree-surfer"; + rev = "732ea6d0f868bcccd2f526be73afa46997d5a2fb"; + sha256 = "0x7kpmxq3n8531ca2bz506swww92wd3x16d125wrk54rxp1lv1cd"; + }; + meta.homepage = "https://github.com/ziontee113/syntax-tree-surfer/"; + }; + tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; version = "2024-07-31"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a544d4ad2131..2bfda55a474d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1709,6 +1709,11 @@ }; }; + syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs { + dependencies = with self; [ nvim-treesitter ]; + meta.maintainers = with lib.maintainers; [ callumio ]; + }; + taskwarrior3 = buildVimPlugin { inherit (taskwarrior3) version pname; src = "${taskwarrior3.src}/scripts/vim"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cba86f4fee7c..1402e16e7d7e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -532,7 +532,48 @@ https://github.com/lsig/messenger.nvim/,HEAD, https://github.com/xero/miasma.nvim/,, https://github.com/dasupradyumna/midnight.nvim/,, https://github.com/hadronized/mind.nvim/,HEAD, +https://github.com/echasnovski/mini-git/,HEAD, +https://github.com/echasnovski/mini.ai/,HEAD, +https://github.com/echasnovski/mini.align/,HEAD, +https://github.com/echasnovski/mini.animate/,HEAD, +https://github.com/echasnovski/mini.base16/,HEAD, +https://github.com/echasnovski/mini.basics/,HEAD, +https://github.com/echasnovski/mini.bracketed/,HEAD, +https://github.com/echasnovski/mini.bufremove/,HEAD, +https://github.com/echasnovski/mini.clue/,HEAD, +https://github.com/echasnovski/mini.colors/,HEAD, +https://github.com/echasnovski/mini.comment/,HEAD, +https://github.com/echasnovski/mini.completion/,HEAD, +https://github.com/echasnovski/mini.cursorword/,HEAD, +https://github.com/echasnovski/mini.deps/,HEAD, +https://github.com/echasnovski/mini.diff/,HEAD, +https://github.com/echasnovski/mini.doc/,HEAD, +https://github.com/echasnovski/mini.extra/,HEAD, +https://github.com/echasnovski/mini.files/,HEAD, +https://github.com/echasnovski/mini.fuzzy/,HEAD, +https://github.com/echasnovski/mini.hipatterns/,HEAD, +https://github.com/echasnovski/mini.hues/,HEAD, +https://github.com/echasnovski/mini.icons/,HEAD, +https://github.com/echasnovski/mini.indentscope/,HEAD, +https://github.com/echasnovski/mini.jump/,HEAD, +https://github.com/echasnovski/mini.jump2d/,HEAD, +https://github.com/echasnovski/mini.map/,HEAD, +https://github.com/echasnovski/mini.misc/,HEAD, +https://github.com/echasnovski/mini.move/,HEAD, +https://github.com/echasnovski/mini.notify/,HEAD, https://github.com/echasnovski/mini.nvim/,, +https://github.com/echasnovski/mini.operators/,HEAD, +https://github.com/echasnovski/mini.pairs/,HEAD, +https://github.com/echasnovski/mini.pick/,HEAD, +https://github.com/echasnovski/mini.sessions/,HEAD, +https://github.com/echasnovski/mini.splitjoin/,HEAD, +https://github.com/echasnovski/mini.starter/,HEAD, +https://github.com/echasnovski/mini.statusline/,HEAD, +https://github.com/echasnovski/mini.surround/,HEAD, +https://github.com/echasnovski/mini.tabline/,HEAD, +https://github.com/echasnovski/mini.test/,HEAD, +https://github.com/echasnovski/mini.trailspace/,HEAD, +https://github.com/echasnovski/mini.visits/,HEAD, https://github.com/wfxr/minimap.vim/,, https://github.com/jghauser/mkdir.nvim/,main, https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, @@ -908,6 +949,7 @@ https://github.com/keith/swift.vim/,, https://github.com/AndrewRadev/switch.vim/,, https://github.com/simrat39/symbols-outline.nvim/,, https://github.com/vim-syntastic/syntastic/,, +https://github.com/ziontee113/syntax-tree-surfer/,HEAD, https://github.com/nanozuki/tabby.nvim/,HEAD, https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,, diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d8a17157d4d0..268e77276a00 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -15,10 +15,10 @@ "src": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "72884ccbf9ec8ce7b65d7fc6f44e127e3abdf799", - "hash": "sha256-+trOeRe9YJzOfGgtKGb5UGYKf8RVxEc+rxEw+bgFz5M=" + "rev": "173edee31172db46f46512918cda11192a2bd977", + "hash": "sha256-liZKtoiAlA/CFFY0AsfxUkWUQCXIgtLlJCaNydvYCXE=" }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-13" }, "beetle-gba": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "12a9895466fc1d895e3f4570494af7b398470975", - "hash": "sha256-O0pdGapKKEcjHamEtRs88++L/HF+eppV7Z7GVQrV8ZM=" + "rev": "261e52b7dd35e8fd2c8b1f760a3ba4cf7fce60c5", + "hash": "sha256-HV/O7zJscLJAzhAoch44kKwBKavasdvf1VDvudLU2q0=" }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-16" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "dd8d2989a652d56a7a1588b65a42cc58477638c2", - "hash": "sha256-XA6hBJa/GFUaRG/+PSUBXaFJedjsRVLfR7Z5pmEwY0k=" + "rev": "ea7b947a8ed156a1ce2ce49329a5686c69f80075", + "hash": "sha256-aqNyYG7H+YBLhQlnkfBfmX3PkBF8GeYXc+KHkvkxlRo=" }, - "version": "unstable-2024-08-25" + "version": "unstable-2024-09-16" }, "easyrpg": { "fetcher": "fetchFromGitHub", @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "a03a6f526684067823de922f1b15d7eb27fd5394", - "hash": "sha256-7J/RuBTpjqG306IsQe9PBnJnT+QzFVNgpG124XaAcRA=" + "rev": "ea3f1696173441f32e35ddd7295c330443691f00", + "hash": "sha256-spTZ7ZjaBiF6CdQwtrTcafKAszHGJxEnR/mzrlD/1mI=" }, - "version": "unstable-2024-09-03" + "version": "unstable-2024-09-12" }, "fceumm": { "fetcher": "fetchFromGitHub", @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "9691fe962228ab0c08f3a4801e6fa0a3c47218ef", - "hash": "sha256-pRrc5EAZQ6fz9JAzOa2mPVByplQ66On2KMqGPVhmA4A=", + "rev": "38de2868a09a015186d692eb01d5fd89308c8128", + "hash": "sha256-eC2BH/3c+2/kktWtYiq6MeI2I5bAkOfwOsTSjkPNqlg=", "fetchSubmodules": true }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-16" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -338,30 +338,30 @@ "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "4d511d7fc3faa7714fa5de2e824793d35d5f4da8", - "hash": "sha256-mfCv7PvroPqzJ/nXCa74h0c7lHlbTVnJM3rNIj3UvQI=" + "rev": "b7f789133970b69ab27d1d181bc8c8930a462130", + "hash": "sha256-LzKWc6mWXxrYu44HwOmVBzXoebvQIwccwLIwUulKFto=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-09-13" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "1fbeee0a46b12d3ab28c4795172929ebb31808ea", - "hash": "sha256-EusFBTtJheGNfbA3lXHGt1IlSbvT6uAY/J/XkIaLJag=" + "rev": "f775ef92c93c495432bbd51d854568c686ec711b", + "hash": "sha256-0WnrCN1F8S+Zy4Mxygm+cc1cSVc6Q91a+VVv7EbmgjA=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-06" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "f0a21a7b30e033cef8e4870f7ab3781dad3606db", - "hash": "sha256-h9QJVlAoztlObYKqOWWRxxJ18+VhgmpMRUQOE+/PCI0=" + "rev": "1eb04313cdd1d4d79e166d9f3e75c4b3223b142c", + "hash": "sha256-lAMVsw0NBFPrG3CRsj6IGKDrVUhH2vDUuAzl2rEEhdk=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-15" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -408,11 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "8b9b8f5f5b47161327d93522318c81fba2087b2f", - "hash": "sha256-xnIYMvLsd4k4wdu3IvWBJy3V8l3NfZvUjYOISunHnwI=", + "rev": "184cebe571ab6b06f5015404bd40404d25433d9a", + "hash": "sha256-8lnpgpNo9wVkaIiZyXMakTnia5CVHnaTMUpB47iVVhE=", "fetchSubmodules": true }, - "version": "unstable-2024-08-31" + "version": "unstable-2024-09-15" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -439,10 +439,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "5f5e32598720cd795dbcf53c1400a122ef0fcd76", - "hash": "sha256-TJUgDHDPPKGx4QnKOI6FpCYcLsY2j7GM1atEoq5zg8Y=" + "rev": "3aa773e2a4e1ded9e255428ec7ef617f09840d6d", + "hash": "sha256-zMD6bC6KNCspDAkTB5lFEiV7wMfYy+mHgljjYOA2b6E=" }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-09" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -652,22 +652,22 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "9752b303037186a2e2581b864bc25136402cdc79", - "hash": "sha256-zJFgZjE9CvozH/5hFdnGsVL6q2Pb4QFvyipebzYjB3g=", + "rev": "2ecf0923f8000464b0056d42c369f698421187b5", + "hash": "sha256-fKfN1e7UANs+CAJzjqWmzFsEzSwoRz6vW8ZD7sh9O7E=", "fetchSubmodules": true }, - "version": "unstable-2024-09-04" + "version": "unstable-2024-09-12" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "4250bdc2a6cadbd450aa48f7e5fbc67b2df172bf", - "hash": "sha256-4Vf7D7aUkZ+eL7Nz0fToDIGB35xi6vc+UJTM0rKpdXE=", + "rev": "0bb69a0ccf5655310de1a41af96fde50cdc85840", + "hash": "sha256-h5edSaaqu0YEqKeMEY4iGWmp0w2AbqbEHergd0DsCGI=", "fetchSubmodules": true }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-17" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -694,10 +694,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "3ef950be5b45b89d09e05bdc1f8f2f4a794dd7a6", - "hash": "sha256-364KIt7LoJqW3nsdy30CDwctWgqH+tgtWUjsmf8AswA=" + "rev": "4b4875f5c29e59fcc7aaab0decdce7af694b70e1", + "hash": "sha256-XaEa3QAzPzboRFdrPlhLmTPy52ClwyR/eQTpo/V++zU=" }, - "version": "unstable-2024-08-26" + "version": "unstable-2024-09-17" }, "quicknes": { "fetcher": "fetchFromGitHub", @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "645a4712e797486787e2a0521928dea7cca143fd", - "hash": "sha256-2WgkouQZ6OW3mmPTMjioPikvg077Jx+bzIwV6Wz4blA=" + "rev": "0727b4a474bf496d06ad42dd7ecc5527996aff3a", + "hash": "sha256-Zx36Yzftascnsqnd3ltutFKGB4fRBcP81vKYJRB2FjU=" }, - "version": "unstable-2024-09-05" + "version": "unstable-2024-09-15" }, "snes9x2002": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix index 2e355ee37614..3d54b41290f7 100644 --- a/pkgs/applications/graphics/pureref/default.nix +++ b/pkgs/applications/graphics/pureref/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType1 rec { pname = "pureref"; - version = "2.0.2"; + version = "2.0.3"; src = runCommand "PureRef-${version}_x64.Appimage" { nativeBuildInputs = [ curl gnugrep cacert ]; - outputHash = "sha256-dCiQlYtjIkh/3x3Rt3Yzbn1KN7ip37Rxv1u8D9y+EMA="; + outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM="; } '' key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index aaacfc329858..eb6c6839bc5b 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.8"; + version = "0.32.9"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-RwY8AXnl2A9TQ3PcVg4c6Ad6rdWE7u8GxSOkYOL5KcM="; + sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 43bf5af6267c..ca2b0c033ee9 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.0"; + version = "0.7.2"; src = fetchCrate { inherit pname version; - hash = "sha256-bn+5LBqZNwrhVX0KfXNBS00rE+BybN/NJmL4lu/oua0="; + hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w="; }; - cargoHash = "sha256-ssjLfNPP8g+2IOv0AQb+Soe/0e1H2LoqFSpmljj/z3o="; + cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1826cf61d147..b0b5fbbe441a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -312,9 +312,12 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "126") [ + ] ++ lib.optionals (versionRange "126" "129") [ # Rebased variant of patch right above to build M126+ with our rust and our clang. ./patches/chromium-126-rust.patch + ] ++ lib.optionals (chromiumVersionAtLeast "129") [ + # Rebased variant of patch right above to build M129+ with our rust and our clang. + ./patches/chromium-129-rust.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch new file mode 100644 index 000000000000..1fe0c7f87324 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch @@ -0,0 +1,21 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 45086d6838cac..81132ad8ecb31 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1727,16 +1727,6 @@ config("runtime_library") { + configs += [ "//build/config/c++:runtime_library" ] + } + +- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We +- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins +- # library. The Rust symbols are marked as weak, so that they can be replaced by +- # the C++ symbols. This config ensures the C++ symbols exist and are strong in +- # order to cause that replacement to occur by explicitly linking in clang's +- # compiler-rt library. +- if (is_clang && !is_nacl && !is_cronet_build) { +- configs += [ "//build/config/clang:compiler_builtins" ] +- } +- + # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia + # configuration. + if (is_posix || is_fuchsia) { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1aee35f96b89..c44c7fc0f70d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,22 +1,22 @@ { stable = { chromedriver = { - hash_darwin = "sha256-UtBJZG+pRdqwxWsvuxYrRJsmFdMEa5h6lWXt39cPxF0="; + hash_darwin = "sha256-303weqU04cCCwlLlSVnEyvKvHu09RjGFLmg5cf/exss="; hash_darwin_aarch64 = - "sha256-2HFrIwc8Jzlg6/eKkJqfd8kwS8c6powU2RnpBGMSBak="; - hash_linux = "sha256-8EEJL0A/t0VabaKHEHC2WHwygUo+PCsKeU09SqRzkVE="; - version = "128.0.6613.137"; + "sha256-TybJYKeMzm9FQp0Jqx82VF1OOiVSpS/QgNUEDlWG7Uc="; + hash_linux = "sha256-D8aKGKnbFT6YUhyhZUuz/XhCrUVS+Y7I7GaI6Qfv2bE="; + version = "129.0.6668.58"; }; deps = { gn = { - hash = "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk="; - rev = "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8"; + hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; + rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; url = "https://gn.googlesource.com/gn"; - version = "2024-06-11"; + version = "2024-08-19"; }; }; - hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00="; - version = "128.0.6613.137"; + hash = "sha256-8dKWu2/ZKw5ZthH1s5wR+h9b0aIqlDhNsPUrlE9DMQg="; + version = "129.0.6668.58"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 79dcfd2a9fc1..fd19982b9502 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,12 +49,6 @@ in rec { mkKops = generic; - kops_1_26 = mkKops rec { - version = "1.26.6"; - sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM="; - rev = "v${version}"; - }; - kops_1_27 = mkKops rec { version = "1.27.1"; sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo="; @@ -62,8 +56,8 @@ rec { }; kops_1_28 = mkKops rec { - version = "1.28.5"; - sha256 = "sha256-spw3lTrp6RlxkTNoZ/3Yz/U2tdvBnwiYORS2QtOSX9k="; + version = "1.28.7"; + sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI="; rev = "v${version}"; }; @@ -72,4 +66,10 @@ rec { sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ="; rev = "v${version}"; }; + + kops_1_30 = mkKops rec { + version = "1.30.1"; + sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A="; + rev = "v${version}"; + }; } diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 62bcad9f2510..d888cdfe5d6c 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-H+EzSsXCjURMBJW9+1EWXsfO4faUXcTcYckK/QJYEFk="; + hash = "sha256-+9Dw6W/Tbg7zRC/ARuuXqZGTcMeSrtdoTvHtsQevigg="; }; vendorHash = "sha256-z1BBE+PH2s7VxWNxneu5y2ZerfzCZNPJowZJVq821Kk="; diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 3f44a9cff710..6dc805296764 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-ZxNU76W7IGSn1cdzmiLI/eMO3dAd8bUQX+1cvANci2k="; + hash = "sha256-KBN7QFjH9wr5G40/224BcTz59aHu+HZISU+LMr54b9c="; }; vendorHash = "sha256-Rr2BXCpliv9KF9wkXQLy6LxKxyPo1pO5SHUTcy2wETM="; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index ff3202d2dd78..84cc60af542d 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gg3FhPDXqnn3y/tcvlHTd0t8KxtPGTrN/2buBSVffBg="; + sha256 = "sha256-FZbuYKYT/LJ9php66N2RYGGYDJxDI9fWfIZAI8X+iRk="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 40355107b055..f4578e81f4f0 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -165,9 +165,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.9.5"; - hash = "sha256-fWyqBDvuBrwqgwi1WU4RsdWssKmaClNyP5zyUf+JmTU="; - vendorHash = "sha256-CAZUs1hxjHXcAteuVJZmkqwnMYUoIau++IFdD1b7yYY="; + version = "1.9.6"; + hash = "sha256-rlqpqiMlLcn2LqqKRU9iFaVqUz/QQtpiiZ39h5ZvpbI="; + vendorHash = "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index c2052473a483..f0e9a267e950 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -1,29 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchYarnDeps -, yarn -, fixup-yarn-lock -, nodejs +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarn, + fixup-yarn-lock, + nodejs, + olm, }: stdenv.mkDerivation (finalAttrs: { pname = "hydrogen-web"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "hydrogen-web"; rev = "v${finalAttrs.version}"; - hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; + hash = "sha256-pXrmWPp4/MYIS1FHEGzAxGbh4OnTaiPudg+NauvA6Vc="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; + hash = "sha256-j+BwlmL0ncaccy9qQbzb9GpDRC4KB9MwOR2ISx+vbLE="; }; - nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ]; + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + ]; configurePhase = '' runHook preConfigure @@ -61,5 +67,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; + inherit (olm.meta) knownVulnerabilities; }; }) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index 72cde3388e82..8f3eabb7bc27 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.19.0"; + version = "7.23.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-wyXVZUuY1TDGAVq7Gx9r/cuBuoMmSk9KQttTJlIN+k8="; + hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index da88b7e02e72..f557734764cd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.23.0-beta.1"; + version = "7.25.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-qVPvzz5dEzff9+qmy92X2VWOhcfYdeoOsV4hX/PcJ+k="; + hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 74c5d82b052b..1277c5752787 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.22.0"; + version = "7.24.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-om3hhGYgrBrcNt3tV9QHZOKuhN/ljaR6SG/6S51xqOo="; + hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ="; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 78d6a1da58ef..6aefc520c7e9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.5.2"; + version = "5.5.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-5edk3+RusCq93A6mkzCoegxr6J2fRc9rtGk6IpGHBAY="; + hash = "sha256-LWIOgyHp43bLN4RQtBKH2HitfVI6AKstPK5es2s+wVw="; }; patches = [ diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index aa36f89c300c..e3cd1999d81b 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-ZHBgsR17U0hWnRZ79S1/TXoOATofvlf3UloHQh1p8Oo="; + hash = "sha256-hF1Nf4+uJXVPpkfsLFKjySMmCSmJdX2LeSHNb0vrBoA="; }; - cargoHash = "sha256-j/Trm6Y64cOxBdHfP172E+YiORZ8B9ukJOpzrLTGI7k="; + cargoHash = "sha256-t1re2vpxGZkC45n0jUytqe2SPAC/+fh4Itq1h9znYnM="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 9fb1732c788b..cf0de377e370 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -5,12 +5,14 @@ , gnupg , gawk , procps +, notmuch , withManpage ? false }: with python311.pkgs; buildPythonApplication rec { pname = "alot"; - version = "0.10"; + version = "0.11"; + pyproject = true; outputs = [ "out" @@ -23,16 +25,18 @@ with python311.pkgs; buildPythonApplication rec { src = fetchFromGitHub { owner = "pazz"; repo = "alot"; - rev = version; - sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis="; + rev = "refs/tags/${version}"; + sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; }; postPatch = '' substituteInPlace alot/settings/manager.py \ - --replace /usr/share "$out/share" + --replace-fail /usr/share "$out/share" ''; - nativeBuildInputs = lib.optional withManpage sphinx; + nativeBuildInputs = [ + setuptools-scm + ] ++ lib.optional withManpage sphinx; propagatedBuildInputs = [ configobj @@ -53,6 +57,7 @@ with python311.pkgs; buildPythonApplication rec { mock procps pytestCheckHook + notmuch ]; postBuild = lib.optionalString withManpage [ @@ -80,7 +85,7 @@ with python311.pkgs; buildPythonApplication rec { cp -r extra/themes $out/share/alot substituteInPlace extra/completion/alot-completion.zsh \ - --replace "python3" "${completionPython.interpreter}" + --replace-fail "python3" "${completionPython.interpreter}" install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index f33ef641abf2..ba77425b5ef8 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -107,6 +107,14 @@ let hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; fetchSubmodules = true; }; + + patches = [ + (fetchpatch { + name = "GCC14.patch"; + url = "https://github.com/mumble-voip/mumble/commit/56945a9dfb62d29dccfe561572ebf64500deaed1.patch"; + hash = "sha256-Frct9XJ/ZuHPglx+GB9h3vVycR8YY039dStIbfkPPDk="; + }) + ]; }; in { mumble = client source; diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index 6c054fecd742..27c34f67d952 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veryfasttree"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "citiususc"; repo = "veryfasttree"; rev = "v${finalAttrs.version}"; - hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA="; + hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 55544e5f461f..fada61d6b6a4 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - hash = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; + hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index cddad036d68e..fb5f28325260 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.18.0"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-no05QZpvaF7Kn9lU26lXjimHJn7xHydmh7Rv50aXPm4="; + hash = "sha256-0057/lRisAw3fzh2LNqHUx72PR/67mW/cqm7hU34GAU="; }; sourceRoot = "."; diff --git a/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh b/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh index bef51f7ef0d7..240879ad7182 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh +++ b/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh @@ -17,7 +17,7 @@ yarnInstallHook() { --offline ) - local -r tmpDir="$(mktemp -d yarnInstallHook.XXXXXX)" + local -r tmpDir="$(mktemp -d)" # yarn pack does not work at all with bundleDependencies. # Since we are imediately unpacking, we can just remove them from package.json diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/by-name/ad/adcli/package.nix similarity index 57% rename from pkgs/os-specific/linux/adcli/default.nix rename to pkgs/by-name/ad/adcli/package.nix index 2f81c12977dc..6ca3445c88a4 100644 --- a/pkgs/os-specific/linux/adcli/default.nix +++ b/pkgs/by-name/ad/adcli/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitLab -, openldap -, libkrb5 -, libxslt -, autoreconfHook -, pkg-config -, cyrus_sasl -, util-linux -, xmlto -, docbook_xsl -, docbook_xml_dtd_43 +{ + lib, + stdenv, + autoreconfHook, + cyrus_sasl, + docbook_xml_dtd_43, + docbook_xsl, + fetchFromGitLab, + libkrb5, + libxslt, + openldap, + pkg-config, + util-linux, + xmlto, }: stdenv.mkDerivation rec { @@ -20,40 +21,40 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "realmd"; - repo = pname; + repo = "adcli"; rev = version; - sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; + hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; }; nativeBuildInputs = [ autoreconfHook - pkg-config docbook_xsl + pkg-config util-linux xmlto ]; buildInputs = [ - openldap + cyrus_sasl libkrb5 libxslt - cyrus_sasl + openldap ]; configureFlags = [ "--disable-debug" ]; postPatch = '' substituteInPlace tools/Makefile.am \ - --replace 'sbin_PROGRAMS' 'bin_PROGRAMS' + --replace-fail 'sbin_PROGRAMS' 'bin_PROGRAMS' substituteInPlace doc/Makefile.am \ - --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \ - '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl' + --replace-fail 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \ + '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl' function patch_docbook() { substituteInPlace $1 \ - --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ - "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" + --replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" } patch_docbook doc/adcli.xml patch_docbook doc/adcli-devel.xml @@ -65,7 +66,10 @@ stdenv.mkDerivation rec { description = "Helper library and tools for Active Directory client operations"; mainProgram = "adcli"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ SohamG anthonyroussel ]; + maintainers = with maintainers; [ + SohamG + anthonyroussel + ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/amazon-ec2-utils/default.nix b/pkgs/by-name/am/amazon-ec2-utils/package.nix similarity index 73% rename from pkgs/tools/admin/amazon-ec2-utils/default.nix rename to pkgs/by-name/am/amazon-ec2-utils/package.nix index 5458572f311c..27fdef05c1a8 100644 --- a/pkgs/tools/admin/amazon-ec2-utils/default.nix +++ b/pkgs/by-name/am/amazon-ec2-utils/package.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, bash -, python3 -, installShellFiles -, gawk -, curl +{ + stdenv, + lib, + bash, + curl, + fetchFromGitHub, + gawk, + installShellFiles, + python3, }: stdenv.mkDerivation rec { @@ -19,20 +20,23 @@ stdenv.mkDerivation rec { hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; strictDeps = true; + nativeBuildInputs = [ + installShellFiles + ]; + buildInputs = [ bash python3 ]; - nativeBuildInputs = [ - installShellFiles - ]; - - installPhase = '' + postInstall = '' install -Dm755 -t $out/bin/ ebsnvme-id install -Dm755 -t $out/bin/ ec2-metadata install -Dm755 -t $out/bin/ ec2nvme-nsid @@ -48,14 +52,14 @@ stdenv.mkDerivation rec { ''; postFixup = '' - for i in $out/etc/udev/rules.d/*.rules $out/lib/udev/rules.d/*.rules ; do - substituteInPlace "$i" \ - --replace '/usr/sbin' "$out/bin" \ - --replace '/bin/awk' '${gawk}/bin/awk' - done + substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \ + --replace-fail '/usr/sbin' "$out/bin" + + substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \ + --replace-fail '/bin/awk' '${gawk}/bin/awk' substituteInPlace "$out/bin/ec2-metadata" \ - --replace 'curl' '${curl}/bin/curl' + --replace-fail 'curl' '${curl}/bin/curl' ''; doInstallCheck = true; @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { description = "Contains a set of utilities and settings for Linux deployments in EC2"; homepage = "https://github.com/amazonlinux/amazon-ec2-utils"; license = licenses.mit; - maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ]; + maintainers = with maintainers; [ + ketzacoatl + thefloweringash + anthonyroussel + ]; }; } diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/by-name/as/asouldocs/package.nix similarity index 76% rename from pkgs/servers/asouldocs/default.nix rename to pkgs/by-name/as/asouldocs/package.nix index ee8ced4f156c..f5392796fdde 100644 --- a/pkgs/servers/asouldocs/default.nix +++ b/pkgs/by-name/as/asouldocs/package.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + asouldocs, + buildGoModule, + fetchFromGitHub, + testers, +}: buildGoModule rec { pname = "asouldocs"; @@ -13,6 +19,11 @@ buildGoModule rec { vendorHash = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU="; + passthru.tests.version = testers.testVersion { + package = asouldocs; + command = "asouldocs --version"; + }; + meta = with lib; { description = "Web server for multi-language, real-time synchronization and searchable documentation"; homepage = "https://asouldocs.dev/"; diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix similarity index 90% rename from pkgs/tools/admin/aws-encryption-sdk-cli/default.nix rename to pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix index 5fab6fe34ea4..62cda863f0c7 100644 --- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix +++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix @@ -1,9 +1,10 @@ -{ lib -, python3 -, fetchPypi -, nix-update-script -, testers -, aws-encryption-sdk-cli +{ + lib, + aws-encryption-sdk-cli, + fetchPypi, + nix-update-script, + python3, + testers, }: let @@ -41,8 +42,8 @@ localPython.pkgs.buildPythonApplication rec { attrs aws-encryption-sdk base64io - urllib3 setuptools # for pkg_resources + urllib3 ]; doCheck = true; @@ -59,7 +60,10 @@ localPython.pkgs.buildPythonApplication rec { ]; # Upstream did not adapt to pytest 8 yet. - pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; + pytestFlagsArray = [ + "-W" + "ignore::pytest.PytestRemovedIn8Warning" + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/by-name/ax/axis2/package.nix similarity index 100% rename from pkgs/servers/http/tomcat/axis2/default.nix rename to pkgs/by-name/ax/axis2/package.nix index 771a38376fa9..adb305f3100e 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/by-name/ax/axis2/package.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, - fetchurl, ant, + fetchurl, jdk, + nixosTests, stripJavaArchivesHook, unzip, - nixosTests, }: stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 8c3482676d3f..1fa304672947 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -11,13 +11,13 @@ }: let - version = "1.17.4"; + version = "1.17.5"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-7lJUyn7UAY+wdbPXcLFz54m2Jl90EMZ6ieSPWysMoWE="; + hash = "sha256-DaNxPGY0ahTcluCnsEZNL2oP9zKWQlON8i1bxeJ5GnU="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -47,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-hd85cCpxx0vqtUXDUorHK8I9IbGZiwewI/RxKF/9ZNw="; + npmDepsHash = "sha256-A1XP2IMfQMI1fFk2leuvm/57MsK43Md6Kyag9dQVAdg="; dontNpmBuild = true; # Uncomment this flag when using unreleased peer dependencies # npmFlags = [ "--legacy-peer-deps" ]; @@ -94,7 +94,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-UKxFWhgarMdT24rFU5Ev+JoKbT6ByLnZ1CTKd34YrRE="; + npmDepsHash = "sha256-wvxwvPdTKcw4X8F5800ft4an7/xwmRPlL1Wzcm5jim8="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 4ba6c90fdeb8..db8e357899f6 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.11"; + version = "2.2.12"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-MPeGaAoKbLit/d0UCZjAEso4i2vZ8H4D8Ia8Mutqnvg="; + hash = "sha256-PoPIIwe2SlK/iQTyqIhMG0dRobU98L5hnOciMmi9coo="; }; - cargoHash = "sha256-5tSM5sqrePpP7YOLuKi4i78F48oSexLVHQSyx6g7fio="; + cargoHash = "sha256-En5TVCW/URJEry4sTd+vdi8K1YO2L0X5pYu/TGsrx6U="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 3ff340432e8b..c6a3645f8b26 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - hash = "sha256-f1Ec2dJGVjk9Jp5nmcVYwTyIlmnZmERj1pV9weVO3lI="; + hash = "sha256-OU1X8EB0IBABlXJklUUCOBhwbcnJNczzjnTl4e8/BYY="; }; - cargoHash = "sha256-wUGOabFTKLCEmg4zNPUklK3YddIIM4N3pev2TtlVthM="; + cargoHash = "sha256-0/fdQ9l4vm5Zy8QEvftKqt5GqPn+BkntyJoRiSaSbmU="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/by-name/cc/ccid/package.nix similarity index 84% rename from pkgs/tools/security/ccid/default.nix rename to pkgs/by-name/cc/ccid/package.nix index 12f65546e92e..af3afd1b24ac 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/by-name/cc/ccid/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchurl -, flex -, pcsclite -, pkg-config -, libusb1 -, perl -, zlib -, gitUpdater +{ + lib, + stdenv, + fetchurl, + flex, + gitUpdater, + libusb1, + pcsclite, + perl, + pkg-config, + zlib, }: stdenv.mkDerivation rec { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - substituteInPlace src/Makefile.in --replace /bin/echo echo + substituteInPlace src/Makefile.in --replace-fail /bin/echo echo ''; configureFlags = [ @@ -39,25 +40,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex - pkg-config perl + pkg-config ]; buildInputs = [ - pcsclite libusb1 + pcsclite zlib ]; postInstall = '' 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 "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" + --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" ''; # The resulting shared object ends up outside of the default paths which are # usually getting stripped. - stripDebugList = ["pcsc"]; + stripDebugList = [ "pcsc" ]; passthru.updateScript = gitUpdater { url = "https://salsa.debian.org/rousseau/CCID.git"; diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix index 7d497ec35166..8588a2d6f581 100644 --- a/pkgs/by-name/ce/celeste64/package.nix +++ b/pkgs/by-name/ce/celeste64/package.nix @@ -78,7 +78,7 @@ buildDotnetModule rec { meta = { license = with lib.licenses; [ unfree mit ]; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; - maintainers = with lib.maintainers; [ lychee ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "Celeste64"; homepage = "https://github.com/ExOK/Celeste64"; description = "Celeste 64: Fragments of the Mountain"; diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index 1014b1f1fc33..36708fb39215 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -44,6 +44,8 @@ buildGoModule rec { ]; postInstall = '' + substituteInPlace nix/so.libdb.dissent.service \ + --replace-warn "/usr/bin/dissent" "$out/bin/dissent" install -D -m 444 -t $out/share/applications nix/so.libdb.dissent.desktop install -D -m 444 -t $out/share/icons/hicolor/scalable/apps internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg install -D -m 444 -t $out/share/icons/hicolor/symbolic/apps internal/icons/symbolic/apps/so.libdb.dissent-symbolic.svg diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 041fb9ff08e9..08e9260361b7 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -1,6 +1,5 @@ { lib, - fetchpatch, buildGo123Module, fetchFromGitHub, git, @@ -9,24 +8,16 @@ buildGo123Module rec { pname = "git-spice"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; rev = "refs/tags/v${version}"; - hash = "sha256-ftNLe/3akvk6nUrseBqpbJQSiUPEJO6cTEc7uEBKX3k="; + hash = "sha256-VODBN+3xDa+sGynhnWnnhPy0VEKPWOQeh2Ge75OTS0A="; }; - vendorHash = "sha256-f7bjlTVwCFoQrgbeyAvsVAS6vy5uE/AvMGKEutE1lfs="; - - # Fixes flaky test. Remove next release. - patches = [ - (fetchpatch { - url = "https://github.com/abhinav/git-spice/commit/92c28474bab81881443129e4a8e9bfc3f1564931.patch"; - hash = "sha256-6v++jG7Wm6awqHRiNzwjX25BB8X9yGYhSzcUDNQKJ7k="; - }) - ]; + vendorHash = "sha256-irYXuh0KmCmeZ2fKNduu7zpVqDQmmR7H2bNTMa2zOjI="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index f9c85dbcf6e9..19f81b25989c 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-07-22"; + version = "0-unstable-2024-09-12"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "f14a99e1369a6348a4ecd4a5b2d9c067b83f7b2a"; - hash = "sha256-WuZX2A5nLk8vMlK0ZlDlbeb79wCCWrGUf2CbqfnbUzk="; + rev = "48faf6afee9eea5f3b8c277c936bcb9f76bd95f7"; + hash = "sha256-LAMVTDVCxjk+reS/StsVdTlsx0DrCxNLClWk6za5D5o="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix new file mode 100644 index 000000000000..c06072a41088 --- /dev/null +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -0,0 +1,144 @@ +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, + buildPackages, + gnu-efi, + mtools, + openssl, + perl, + xorriso, + xz, + syslinux, + embedScript ? null, + additionalTargets ? { }, + additionalOptions ? [ ], +}: + +let + targets = + additionalTargets + // lib.optionalAttrs stdenv.isx86_64 { + "bin-x86_64-efi/ipxe.efi" = null; + "bin-x86_64-efi/ipxe.efirom" = null; + "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-x86_64-efi/snp.efi" = null; + } + // lib.optionalAttrs stdenv.hostPlatform.isx86 { + "bin/ipxe.dsk" = null; + "bin/ipxe.usb" = null; + "bin/ipxe.iso" = null; + "bin/ipxe.lkrn" = null; + "bin/undionly.kpxe" = null; + } + // lib.optionalAttrs stdenv.isAarch32 { + "bin-arm32-efi/ipxe.efi" = null; + "bin-arm32-efi/ipxe.efirom" = null; + "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm32-efi/snp.efi" = null; + } + // lib.optionalAttrs stdenv.isAarch64 { + "bin-arm64-efi/ipxe.efi" = null; + "bin-arm64-efi/ipxe.efirom" = null; + "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm64-efi/snp.efi" = null; + }; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "ipxe"; + version = "1.21.1-unstable-2024-09-13"; + + nativeBuildInputs = [ + gnu-efi + mtools + openssl + perl + xorriso + xz + ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "ipxe"; + repo = "ipxe"; + rev = "c85ad1246890cf3c0c5f2ac6de06ab046ddd0043"; + hash = "sha256-Py0mXcCj/NhVW3crngR9ZLHvH9N0QJeVmykc3k+yi6Y="; + }; + + # Calling syslinux on a FAT image isn't going to work on Aarch64. + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' + substituteInPlace src/util/genfsimg --replace " syslinux " " true " + ''; + + # Hardening is not possible due to assembler code. + hardeningDisable = [ + "pic" + "stackprotector" + ]; + + makeFlags = [ + "ECHO_E_BIN_ECHO=echo" + "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + "CROSS=${stdenv.cc.targetPrefix}" + ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; + + enabledOptions = [ + "PING_CMD" + "IMAGE_TRUST_CMD" + "DOWNLOAD_PROTO_HTTP" + "DOWNLOAD_PROTO_HTTPS" + ] ++ additionalOptions; + + configurePhase = + '' + runHook preConfigure + for opt in ${lib.escapeShellArgs finalAttrs.enabledOptions}; do echo "#define $opt" >> src/config/general.h; done + substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo + '' + + lib.optionalString stdenv.hostPlatform.isx86 '' + substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux + '' + + '' + runHook postConfigure + ''; + + preBuild = "cd src"; + + buildFlags = lib.attrNames targets; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}" + ) targets + )} + + # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending + # let's provide it as a symlink to be compatible in this case. + ln -s undionly.kpxe $out/undionly.kpxe.0 + + runHook postInstall + ''; + + enableParallelBuilding = true; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + + meta = { + description = "Network boot firmware"; + homepage = "https://ipxe.org/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sigmasquadron ]; + }; +}) diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/by-name/ji/jira-cli-go/package.nix similarity index 80% rename from pkgs/development/tools/jira-cli-go/default.nix rename to pkgs/by-name/ji/jira-cli-go/package.nix index eab6becf61ff..49b375ad0017 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/by-name/ji/jira-cli-go/package.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }: +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + jira-cli-go, + less, + more, + nix-update-script, + testers, +}: buildGoModule rec { pname = "jira-cli-go"; @@ -7,33 +18,22 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ankitpokhrel"; repo = "jira-cli"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-edytj9hB8lDwy3qGSyLudu5G4DSRGKhD0vDoWz5eUgs="; }; vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao="; + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}" "-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0" "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; - __darwinAllowLocalNetworking = true; - - nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH - - passthru = { - tests.version = testers.testVersion { - package = jira-cli-go; - command = "jira version"; - inherit version; - }; - updateScript = nix-update-script { }; - }; - - nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jira \ --bash <($out/bin/jira completion bash) \ @@ -44,12 +44,31 @@ buildGoModule rec { installManPage man/* ''; + nativeCheckInputs = [ + less + more + ]; # Tests expect a pager in $PATH + + passthru = { + tests.version = testers.testVersion { + package = jira-cli-go; + command = "jira version"; + inherit version; + }; + updateScript = nix-update-script { }; + }; + + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Feature-rich interactive Jira command line"; homepage = "https://github.com/ankitpokhrel/jira-cli"; changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ bryanasdev000 anthonyroussel ]; + maintainers = with maintainers; [ + bryanasdev000 + anthonyroussel + ]; mainProgram = "jira"; }; } diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index b18d972886f0..cde4f5d62c14 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kitex"; - version = "0.11.0"; + version = "0.11.3"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; rev = "v${version}"; - hash = "sha256-SD898LbygIHL0X5YVSoJRdP1GQiB8NGfIAFAlx4Gfe8="; + hash = "sha256-FjFhbkEMxuBUVfytPk27mrBaAlGXZ9RPWeBy+m0bPV8="; }; - vendorHash = "sha256-tdtiG0jf7Ilvs1KZWggGyqBOQXAWs+zlF09AN80AoC0="; + vendorHash = "sha256-e98x8lSwO/u8lFbqDmbVNjVG57Y93/P0ls2UUgRvkH0="; subPackages = [ "tool/cmd/kitex" ]; diff --git a/pkgs/by-name/li/libcsa/package.nix b/pkgs/by-name/li/libcsa/package.nix new file mode 100644 index 000000000000..5308a71d962d --- /dev/null +++ b/pkgs/by-name/li/libcsa/package.nix @@ -0,0 +1,30 @@ +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + name = "csa"; + version = "1.26-unstable-2024-03-22"; + + src = fetchFromGitHub { + owner = "sakov"; + repo = "csa-c"; + rev = "7b48134613d1d3b337af6d5762df9999a703fb1a"; + hash = "sha256-G/VhXpdvXBT9I6pwiQXVqCoXhc29wJQpGyLeM3kgv7I="; + }; + + sourceRoot = "${finalAttrs.src.name}/csa"; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "C code for cubic spline approximation of 2D scattered data"; + homepage = "https://github.com/sakov/csa-c/"; + platforms = platforms.unix; + license = licenses.bsd3; + maintainers = with maintainers; [ mkez ]; + mainProgram = "csabathy"; + }; +}) diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/by-name/li/libspatialindex/package.nix similarity index 66% rename from pkgs/development/libraries/libspatialindex/default.nix rename to pkgs/by-name/li/libspatialindex/package.nix index 0f9d958ab8c9..ead9fe2b09e0 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/by-name/li/libspatialindex/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fixDarwinDylibNames, +}: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; @@ -15,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs test/ ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) @@ -31,11 +37,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib + ''; + + meta = { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix index d3bb146a60f0..30f4cc3f6356 100644 --- a/pkgs/by-name/md/mdbook-alerts/package.nix +++ b/pkgs/by-name/md/mdbook-alerts/package.nix @@ -7,7 +7,7 @@ CoreServices ? darwin.apple_sdk.frameworks.CoreServices, }: let - version = "0.6.4"; + version = "0.6.5"; in rustPlatform.buildRustPackage { pname = "mdbook-alerts"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "lambdalisue"; repo = "rs-mdbook-alerts"; rev = "v${version}"; - hash = "sha256-bg3X7M2H553tGxH8cEkkT0XK20fWwkp2nTVEgtZ819s="; + hash = "sha256-vlp1tjtdbaH1sax3HAN665fspqRheHZzu5u/QjEejHg="; }; - cargoHash = "sha256-MMhpH3WIAXnjw6xOl2HNfrIFEwjHfVDPquWnFhhZCMU="; + cargoHash = "sha256-nzVvktweqrow7P/I8DhDoVJNj1COCeEhx6HLY536hYE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix new file mode 100644 index 000000000000..afadac89b9b8 --- /dev/null +++ b/pkgs/by-name/me/meow/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "meow"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "PixelSergey"; + repo = "meow"; + rev = "v${version}"; + hash = "sha256-PB871c137uxxPaYbV6NB8kECVUrQWTeVz0ciVLHrph4="; + }; + + cargoHash = "sha256-4BoKZUgt4jf8jy2HU3J6RuT0GXNqkJnBUR09wNlNm7E="; + + postInstall = '' + ln -s $out/bin/meow-cli $out/bin/meow + ''; + + meta = { + description = "Print ASCII cats to your terminal"; + homepage = "https://github.com/PixelSergey/meow"; + license = lib.licenses.mit; + mainProgram = "meow"; + maintainers = with lib.maintainers; [ pixelsergey ]; + }; +} diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix index 9784cd769f9d..aff4446489aa 100644 --- a/pkgs/by-name/mo/modelscan/package.nix +++ b/pkgs/by-name/mo/modelscan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "modelscan"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "protectai"; repo = "modelscan"; rev = "refs/tags/v${version}"; - hash = "sha256-G+jBbDiDiQr3E5JuUdNvfIjVpoVCpsDQRoZ7L659BF0="; + hash = "sha256-90VnIVQFjtKgLCHc+tmOtDdgJP8aaH4h5ZiOOejnXgQ="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index 22fe068feeaf..94c4068cb735 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -6,17 +6,18 @@ lib, }: -rustPlatform.buildRustPackage { - name = "nix-ld"; +rustPlatform.buildRustPackage rec { + pname = "nix-ld"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mic92"; repo = "nix-ld"; - rev = "2.0.0"; + rev = version; hash = "sha256-rmSXQ4MYQe/OFDBRlqqw5kyp9b/aeEg0Fg9c167xofg="; }; - cargoHash = "sha256-w6CQx9kOyBtM2nMwdFb+LtU4oHVEYrTNVmH1A6R5DHM="; + cargoHash = "sha256-BVulfs4zm3Iruq00H49QcxR3V+iZvePtLBTytdXfLP4="; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/by-name/ni/nix-update/nix-update-script.nix b/pkgs/by-name/ni/nix-update/nix-update-script.nix new file mode 100644 index 000000000000..82da510d5061 --- /dev/null +++ b/pkgs/by-name/ni/nix-update/nix-update-script.nix @@ -0,0 +1,11 @@ +{ + lib, + nix-update, +}: + +{ + attrPath ? null, + extraArgs ? [ ], +}: + +[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optionals (attrPath != null) [ attrPath ] diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 95cc0518ebe2..08f8fe9bcf1e 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -1,42 +1,62 @@ -{ lib -, python3 -, fetchFromGitHub -, nix -, nix-prefetch-git -, nixpkgs-review +{ + lib, + callPackage, + fetchFromGitHub, + nix, + nix-prefetch-git, + nixpkgs-review, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { - pname = "nix-update"; - version = "1.5.1"; - pyproject = true; +let + self = python3Packages.buildPythonApplication { + pname = "nix-update"; + version = "1.5.1"; + pyproject = true; - src = fetchFromGitHub { - owner = "Mic92"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-update"; + rev = "refs/tags/${self.version}"; + hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; + }; + + build-system = [ python3Packages.setuptools ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + nix + nix-prefetch-git + nixpkgs-review + ]) + ]; + + checkPhase = '' + runHook preCheck + + $out/bin/nix-update --help >/dev/null + + runHook postCheck + ''; + + passthru = { + nix-update-script = callPackage ./nix-update-script.nix { nix-update = self; }; + }; + + meta = { + homepage = "https://github.com/Mic92/nix-update/"; + description = "Swiss-knife for updating nix packages"; + changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + mic92 + ]; + mainProgram = "nix-update"; + }; }; - - nativeBuildInputs = [ - python3.pkgs.setuptools - ]; - - makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch-git nixpkgs-review ]) - ]; - - checkPhase = '' - $out/bin/nix-update --help >/dev/null - ''; - - meta = with lib; { - description = "Swiss-knife for updating nix packages"; - inherit (src.meta) homepage; - changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda mic92 ]; - mainProgram = "nix-update"; - platforms = platforms.all; - }; -} +in +self diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index e5ebf9a2711c..cbab08367bf3 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.6.0"; + version = "0.6.1"; in buildGoModule { @@ -17,7 +17,7 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-6bzVT+SnYAFDYdy5nyXPpmUuLsmjvUuaIlPkICjw30U="; + hash = "sha256-cAfBEhgHnzmSD8/pVi8VVjnC3O+WgokzdPSzvE5hDec="; }; vendorHash = "sha256-jIcuyt4tzfz+WkyQnMZs6viLnmwtGbVawgnz9M/xAS8="; diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix index 21812f4b1492..931043d6dcd7 100644 --- a/pkgs/by-name/pi/picocrypt-cli/package.nix +++ b/pkgs/by-name/pi/picocrypt-cli/package.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "picocrypt-cli"; - version = "2.07"; + version = "2.08"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "CLI"; rev = version; - hash = "sha256-z6xtqo0VBLneXNaP6NdyuHTX905cqrzxvECIHVBGNlY="; + hash = "sha256-6/VmacOXQOCkjLFyzDPyohOueF3WKJu7XCAD9oiFXEc="; }; sourceRoot = "${src.name}/picocrypt"; - vendorHash = "sha256-Nuo4oIJxp+liNLNXRvbFTE1ElEIM1OBp5CTb0KEV/7g="; + vendorHash = "sha256-QIeuqdoC17gqxFgKJ/IU024dgofBCizWTj2S7CCmED4="; ldflags = [ "-s" diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix new file mode 100644 index 000000000000..e5bca7571a20 --- /dev/null +++ b/pkgs/by-name/po/powertop/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + autoconf-archive, + autoreconfHook, + fetchFromGitHub, + gettext, + libnl, + ncurses, + nix-update-script, + pciutils, + pkg-config, + powertop, + testers, + xorg, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "powertop"; + version = "2.15"; + + src = fetchFromGitHub { + owner = "fenrus75"; + repo = "powertop"; + rev = "refs/tags/v${version}"; + hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M="; + }; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gettext + libnl + ncurses + pciutils + zlib + ]; + + postPatch = '' + substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe" + substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}" + substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool" + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = powertop; + command = "powertop --version"; + inherit version; + }; + }; + + meta = with lib; { + inherit (src.meta) homepage; + changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}"; + description = "Analyze power consumption on Intel-based laptops"; + mainProgram = "powertop"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ + fpletz + anthonyroussel + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix index 7cd4e44716f8..890107dd07f5 100644 --- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tynany"; repo = "frr_exporter"; rev = "v${version}"; - hash = "sha256-6a58COPlV6xyy/EAJmt+lXH23ULJY5ysMM6+3VDiTmE="; + hash = "sha256-SDtI7CvCeuRL1cXNsWGCl/zupVbgMxv5bzYYqJWTrMw="; }; in buildGoModule { pname = "prometheus-frr-exporter"; - vendorHash = "sha256-AvJzt9+81WDFXU0IOo9nqT/mEYixuhBIJfBx395Wsdo="; + vendorHash = "sha256-G+S4XORrg0AEKoAqYdmg+uW6x0Ub5diQTyQGY0iebHg="; inherit src version; ldflags = [ diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index 32c98e42fdd6..664c6b7c88e8 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -1,31 +1,32 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "pysqlrecon"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Tw1sm"; repo = "PySQLRecon"; rev = "refs/tags/v${version}"; - hash = "sha256-AJCvGpOjnh5ih5HrrpI+x0zyB7P6rMGL70707UunhEM="; + hash = "sha256-+pme4uOgsh6iZEL73PaR1Y55r+Z/SPEVD2QWBsnMsNs="; }; pythonRelaxDeps = [ + "impacket" "rich" "typer" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; propagatedBuildInputs = with python3.pkgs; [ impacket + pycryptodome rich typer ]; @@ -33,9 +34,7 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "pysqlrecon" - ]; + pythonImportsCheck = [ "pysqlrecon" ]; meta = with lib; { description = "Offensive MSSQL toolkit"; diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 28ad60cbf7c4..8f46010cce05 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2024.07.30-2712"; + version = "2024.09.10-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-4rTq8O6TqE7vRr4o+/149FraYLmKFUQRUFffzC0aeIQ="; + hash = "sha256-SLPLZzSRsPDxGtFnFFu99z3HqGDLDNuMWbgUKdeJyuI="; }; buildInputs = [ python3 ]; diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 749fa25fbb15..5df3689928c1 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.16.111"; + version = "1.16.116"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-aelkdrILxe7Wf1BZmSIQ5XMJsyxHM9oW8h6DDzeA0uQ="; + hash = "sha256-H89ge4b8Xm6YJXQSiPA/FBnlbekAG0Vobr2EQ4459q4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index 413c8b2f4695..231714941462 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -7,6 +7,7 @@ poco, ocl-icd, opencl-clhpp, + gitUpdater, callPackage, }: @@ -38,8 +39,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests = { - run-on-nixos-artwork = callPackage ./tests/run-on-nixos-artwork.nix { }; + passthru = { + tests = { + run-on-nixos-artwork = callPackage ./tests/run-on-nixos-artwork.nix { }; + }; + updateScript = gitUpdater { }; }; meta = with lib; { diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 260cf2897862..6f488735670a 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.33.0"; + version = "1.34.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-7hb1RU33wGeSESxY16pYJfQ2O3QOT92Em6jlh8oP/Zc="; + hash = "sha256-SJFQFOd9m+38TsclIs4FxAl9kejgcUG895qjy4iXKdk="; }; vendorHash = null; diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index f003e5b80390..516756d12c77 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-LjWpWgOInnPL4Ke8Ntk+bEJBljPSEe14RCKzN50JUGA="; + hash = "sha256-RP9Tv6IrDfawjXCQp0nB0nd7b6IwkdykHcEfGEguFHo="; }; - cargoHash = "sha256-Ynnp7jSnkNHbL98JOXjV6v97IXWwi2HiZC5SkChCRv0="; + cargoHash = "sha256-HxIyWlFKDRod5nSENZguNYz/vn+E9Ux0K3dMhX7I/zQ="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/sn/sn-pro/package.nix b/pkgs/by-name/sn/sn-pro/package.nix index b8e431c6efcf..d1f916551a6a 100644 --- a/pkgs/by-name/sn/sn-pro/package.nix +++ b/pkgs/by-name/sn/sn-pro/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sn-pro"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "supernotes"; repo = "sn-pro"; rev = version; - hash = "sha256-G/DIHWs91HYVbrV/jZ4aFsCCjqORo8YeqcHGN0LZ8p4="; + hash = "sha256-7GrCEYgP6kfdlAWjNddmkwJrB/s1mFmugMGPPOM34JA="; }; installPhase = '' diff --git a/pkgs/misc/solfege/css.patch b/pkgs/by-name/so/solfege/css.patch similarity index 100% rename from pkgs/misc/solfege/css.patch rename to pkgs/by-name/so/solfege/css.patch diff --git a/pkgs/misc/solfege/menubar.patch b/pkgs/by-name/so/solfege/menubar.patch similarity index 100% rename from pkgs/misc/solfege/menubar.patch rename to pkgs/by-name/so/solfege/menubar.patch diff --git a/pkgs/misc/solfege/default.nix b/pkgs/by-name/so/solfege/package.nix similarity index 67% rename from pkgs/misc/solfege/default.nix rename to pkgs/by-name/so/solfege/package.nix index 09964fd58bcc..d3c8d113f75c 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/by-name/so/solfege/package.nix @@ -1,17 +1,34 @@ -{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3 -, buildPythonApplication, pycairo, pygobject3 -, gdk-pixbuf, gobject-introspection, gtk3, librsvg -, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond -, automake, autoconf, txt2man +{ + lib, + alsa-utils, + autoconf, + automake, + csound, + fetchurl, + gdk-pixbuf, + gettext, + gobject-introspection, + gtk3, + librsvg, + lilypond, + mpg123, + pkg-config, + python3Packages, + texinfo, + timidity, + txt2man, + vorbis-tools, + wrapGAppsHook3, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "solfege"; version = "3.23.4"; + format = "other"; src = fetchurl { url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz"; - sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; + hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk="; }; patches = [ @@ -27,15 +44,14 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ - automake autoconf + automake gdk-pixbuf gettext + gobject-introspection pkg-config texinfo txt2man - - gobject-introspection wrapGAppsHook3 ]; @@ -44,7 +60,7 @@ buildPythonApplication rec { librsvg ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ pycairo pygobject3 ]; @@ -59,7 +75,11 @@ buildPythonApplication rec { default.config ''; - format = "other"; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; enableParallelBuilding = true; @@ -68,7 +88,11 @@ buildPythonApplication rec { homepage = "https://www.gnu.org/software/solfege/"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor orivej anthonyroussel ]; + maintainers = with maintainers; [ + bjornfor + orivej + anthonyroussel + ]; mainProgram = "solfege"; }; } diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/by-name/so/solfege/texinfo.patch similarity index 100% rename from pkgs/misc/solfege/texinfo.patch rename to pkgs/by-name/so/solfege/texinfo.patch diff --git a/pkgs/misc/solfege/webbrowser.patch b/pkgs/by-name/so/solfege/webbrowser.patch similarity index 100% rename from pkgs/misc/solfege/webbrowser.patch rename to pkgs/by-name/so/solfege/webbrowser.patch diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/by-name/so/sonic-server/package.nix similarity index 73% rename from pkgs/servers/search/sonic-server/default.nix rename to pkgs/by-name/so/sonic-server/package.nix index cb5521e9dfe8..62857f464dfc 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/by-name/so/sonic-server/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, nix-update-script -, nixosTests -, testers -, sonic-server +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + nixosTests, + rustPlatform, + sonic-server, + testers, }: rustPlatform.buildRustPackage rec { @@ -21,9 +22,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM="; - # Found argument '--test-threads' which wasn't expected, or isn't valid in this context - doCheck = false; - nativeBuildInputs = [ rustPlatform.bindgenHook ]; @@ -31,19 +29,22 @@ rustPlatform.buildRustPackage rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; postPatch = '' - substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg" + substituteInPlace src/main.rs \ + --replace-fail "./config.cfg" "$out/etc/sonic/config.cfg" ''; postInstall = '' install -Dm444 -t $out/etc/sonic config.cfg install -Dm444 -t $out/lib/systemd/system debian/sonic.service - substituteInPlace \ - $out/lib/systemd/system/sonic.service \ - --replace /usr/bin/sonic $out/bin/sonic \ - --replace /etc/sonic.cfg $out/etc/sonic/config.cfg + substituteInPlace $out/lib/systemd/system/sonic.service \ + --replace-fail /usr/bin/sonic $out/bin/sonic \ + --replace-fail /etc/sonic.cfg $out/etc/sonic/config.cfg ''; + # Found argument '--test-threads' which wasn't expected, or isn't valid in this context + doCheck = false; + passthru = { tests = { inherit (nixosTests) sonic-server; @@ -62,6 +63,9 @@ rustPlatform.buildRustPackage rec { license = licenses.mpl20; platforms = platforms.unix; mainProgram = "sonic"; - maintainers = with maintainers; [ pleshevskiy anthonyroussel ]; + maintainers = with maintainers; [ + pleshevskiy + anthonyroussel + ]; }; } diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix index e7c66ed0c305..4ab043deb0e0 100644 --- a/pkgs/by-name/so/soteria/package.nix +++ b/pkgs/by-name/so/soteria/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage { mainProgram = "soteria"; maintainers = with lib.maintainers; [ NotAShelf - lychee ]; inherit (polkit.meta) platforms; }; diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix index fa931ff011d4..ab74d428cc50 100644 --- a/pkgs/by-name/st/stu/package.nix +++ b/pkgs/by-name/st/stu/package.nix @@ -8,7 +8,7 @@ testers, }: let - version = "0.5.2"; + version = "0.6.2"; in rustPlatform.buildRustPackage { pname = "stu"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "lusingander"; repo = "stu"; rev = "v${version}"; - hash = "sha256-R+ebDW6qkYK92seQHCWGKby544UrNGg+CfdK1NLIwas="; + hash = "sha256-fxVnOftYkl4G6H+jMSy6r/YQgmK15EjKAjdf8MdoaS0="; }; - cargoHash = "sha256-6uporgZTii97xLdEt7KXuSxoRMmFOGEGU3bPXP7Z14g="; + cargoHash = "sha256-/a91ONvKG6aRFAnHDkpOQQFtfGlO1WahWM9LdPs75iw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 2dfa4012fcde..9a0c443faa83 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.5.5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-C2ppLbNv68qpl2bcqWp/PszcCeGCsD0LbEdAM9P1asg="; + hash = "sha256-JFkTD/MGvak8EuDEABGH1xLykSNj4rtnnENAruls6W8="; }; - cargoHash = "sha256-gLepa9JxY9AYyGepV6Uzt1g7apkKWJxf0SiNCSkjUDg="; + cargoHash = "sha256-N/4VHvBA9ij+VLPxJ+1237fnOHGoC6guZ62CYrwfHM4="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix index 5143a9c8f128..667134361d53 100644 --- a/pkgs/by-name/sy/syn2mas/package.nix +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -5,26 +5,26 @@ buildNpmPackage rec { pname = "syn2mas"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "matrix-org"; + owner = "element-hq"; repo = "matrix-authentication-service"; rev = "v${version}"; - hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks="; + hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc="; }; sourceRoot = "${src.name}/tools/syn2mas"; - npmDepsHash = "sha256-Dk/aSkCbuHiZN5H/f692/Yef+f5SJDSXuSMbePkU66g="; + npmDepsHash = "sha256-pRa5qqLsI8Hx9v5tMPDkehczXZjWWAOjfDfLLh2V6Q4="; dontBuild = true; - meta = with lib; { + meta = { description = "Tool to help with the migration of a Matrix Synapse installation to the Matrix Authentication Service"; - homepage = "https://github.com/matrix-org/matrix-authentication-service/tree/main/tools/syn2mas"; - license = licenses.asl20; - maintainers = with maintainers; [ teutat3s ]; + homepage = "https://github.com/element-hq/matrix-authentication-service/tree/main/tools/syn2mas"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ teutat3s ]; mainProgram = "syn2mas"; }; } diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix new file mode 100644 index 000000000000..49e14d438d77 --- /dev/null +++ b/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchgit, + stdenv, + darwin, +}: +rustPlatform.buildRustPackage { + pname = "taler-depolymerization"; + version = "0-unstable-2024-06-17"; + + src = fetchgit { + url = "https://git.taler.net/depolymerization.git/"; + rev = "a0d27ac3bba22d4934ca9f7b244b0d9e45bb484f"; + hash = "sha256-HmQ/DPq/O6aODWms/bSsCVgBF7z246xxfYxiHrAkgYw="; + }; + + cargoHash = "sha256-NgoLCTHhEs45cnx21bU2ko3oWxePSzKgUpnCGqhjvTs="; + + outputs = [ + "out" + "doc" + ]; + + postPatch = '' + # fix missing expression in test docs + substituteInPlace common/src/status.rs \ + --replace-fail ' -> Requested' '() -> Requested' + ''; + + postInstall = '' + mkdir -p $doc/share/doc $out/share/examples + + cp -R docs $doc/share/doc/taler-depolymerization + cp docs/*.conf $out/share/examples + ''; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreFoundation + Security + SystemConfiguration + ] + ); + + meta = { + description = "Wire gateway for Bitcoin/Ethereum"; + homepage = "https://git.taler.net/depolymerization.git/"; + license = lib.licenses.agpl3Only; + maintainers = [ + # maintained by the team working on NGI-supported software, no group for this yet + ]; + }; +} diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index fd92ccb2a577..944c0afc177e 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -37,12 +37,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taler-wallet-core"; - version = "0.13.1"; + version = "0.13.3"; src = fetchgit { url = "https://git.taler.net/wallet-core.git"; rev = "v${finalAttrs.version}"; - hash = "sha256-1TM2kD4HfL3QPzZ3Xzq5Sfycevf94Pkw7HpEoMkujN8="; + hash = "sha256-9pRhaQNnIzbhahMaTVVZqLTlAxh7GZxoz4Gf3TDldAA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 367c845d34c3..4c532f453800 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -15,13 +15,13 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.9.6"; + version = "1.10.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-VonydbN7EiXnQIArOSKgNsIV7zIZQsLihZ41geSx1AA="; + hash = "sha256-AcKjh3DAUoIpsMr+K/T0FT5knbBx54pZmJKCK9HRZVQ="; }; npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc="; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/by-name/th/thanos/package.nix similarity index 64% rename from pkgs/servers/monitoring/thanos/default.nix rename to pkgs/by-name/th/thanos/package.nix index b0f1ca4f6a3d..4842cb0a7d42 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -1,11 +1,12 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, go -, nix-update-script -, nixosTests -, testers -, thanos +{ + lib, + buildGoModule, + fetchFromGitHub, + go, + nix-update-script, + nixosTests, + testers, + thanos, }: buildGoModule rec { @@ -21,18 +22,22 @@ buildGoModule rec { vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50="; - doCheck = true; - subPackages = "cmd/thanos"; - ldflags = let t = "github.com/prometheus/common/version"; in [ - "-X ${t}.Version=${version}" - "-X ${t}.Revision=unknown" - "-X ${t}.Branch=unknown" - "-X ${t}.BuildUser=nix@nixpkgs" - "-X ${t}.BuildDate=unknown" - "-X ${t}.GoVersion=${lib.getVersion go}" - ]; + ldflags = + let + t = "github.com/prometheus/common/version"; + in + [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" + ]; + + doCheck = true; passthru = { updateScript = nix-update-script { }; @@ -51,6 +56,9 @@ buildGoModule rec { changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; mainProgram = "thanos"; - maintainers = with maintainers; [ basvandijk anthonyroussel ]; + maintainers = with maintainers; [ + basvandijk + anthonyroussel + ]; }; } diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 0d5bfea5f77b..e5ec962b6f71 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -1,36 +1,41 @@ -{ lib -, stdenv -, fetchFromGitHub -, zig_0_11 -, testers -, tigerbeetle -, nix-update-script +{ + lib, + stdenvNoCC, + fetchzip, + testers, + tigerbeetle, + nix-update-script, }: let - # Read [these comments](pkgs/development/compilers/zig/hook.nix#L12-L30) on the default Zig flags, and the associated links. tigerbeetle stopped exposing the `-Doptimize` build flag, so we can't use the default Nixpkgs zig hook as-is. tigerbeetle only exposes a boolean `-Drelease` flag which we'll add in the tigerbeetle derivation in this file. - custom_zig_hook = zig_0_11.hook.overrideAttrs (previousAttrs: { - zig_default_flags = builtins.filter (flag: builtins.match "-Doptimize.*" flag == null) previousAttrs.zig_default_flags; - }); + platform = + if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; + hash = builtins.getAttr platform { + "universal-macos" = "sha256-ls2QFCiPkXMTiCHo8AXb5bFl118zjtuQAGl26c4huwU="; + "x86_64-linux" = "sha256-QjQjP5p2fpOLWNGiU2aMMs2bUEFOWfBZrbPGLTOFozg="; + "aarch64-linux" = "sha256-DMxGakZBJhLTgZp7B9lwxilr6yhDVDe/GQCMFaRTWe4="; + }; in -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.15.3"; + version = "0.15.5"; - src = fetchFromGitHub { - owner = "tigerbeetle"; - repo = "tigerbeetle"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-3+uCMoOnyvI//ltEaqTIXytUxxgJrfMnFly11WCh66Q="; + src = fetchzip { + url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; + inherit hash; }; - env.TIGERBEETLE_RELEASE = finalAttrs.version; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; - nativeBuildInputs = [ custom_zig_hook ]; + installPhase = '' + runHook preInstall - zigBuildFlags = [ - "-Drelease" - "-Dgit-commit=0000000000000000000000000000000000000000" - ]; + mkdir -p $out/bin + cp $src/tigerbeetle $out/bin/tigerbeetle + + runHook postInstall + ''; passthru = { tests.version = testers.testVersion { @@ -45,7 +50,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Financial accounting database designed to be distributed and fast"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danielsidhion ]; - platforms = lib.platforms.linux; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ] ++ lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "tigerbeetle"; }; }) diff --git a/pkgs/by-name/tl/tlclient/package.nix b/pkgs/by-name/tl/tlclient/package.nix new file mode 100644 index 000000000000..a789d391ccbe --- /dev/null +++ b/pkgs/by-name/tl/tlclient/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + alsa-lib, + libX11, + pcsclite, + testers, +}: + +stdenv.mkDerivation ( + finalAttrs: + let + version = "4.17.0"; + buildNum = "3543"; + in + { + pname = "tlclient"; + version = "${version}-${buildNum}"; + + src = fetchurl { + url = "https://www.cendio.com/downloads/clients/tl-${finalAttrs.version}-client-linux-dynamic-x86_64.tar.gz"; + hash = "sha256-7pl97xGNFwSDpWMpBvkz/bfMsWquVsJVGB+feWJvRQY="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + libX11 + pcsclite + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -R lib "$out/" + cp -R lib/tlclient/share "$out/" + + install -Dm644 "lib/tlclient/EULA.txt" "$out/share/licenses/tlclient/EULA.txt" + install -m644 "lib/tlclient/open_source_licenses.txt" "$out/share/licenses/tlclient/open_source_licenses.txt" + substituteInPlace "$out/share/applications/thinlinc-client.desktop" \ + --replace-fail "/opt/thinlinc/bin/" "" + + install -Dm644 "etc/tlclient.conf" "$out/etc/tlclient.conf" + install -Dm755 bin/tlclient* -t "$out/bin" + install -Dm644 "lib/tlclient/thinlinc_128.png" "$out/share/icons/hicolor/128x128/apps/thinlinc-client.png" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "${version} build ${buildNum}"; + }; + + meta = { + description = "Linux remote desktop client built on open source technology"; + license = { + fullName = "Cendio End User License Agreement 3.2"; + url = "https://www.cendio.com/thinlinc/docs/legal/eula"; + free = false; + }; + homepage = "https://www.cendio.com/"; + changelog = "https://www.cendio.com/thinlinc/docs/relnotes/${version}/"; + maintainers = with lib.maintainers; [ felixalbrigtsen ]; + platforms = with lib.platforms; linux ++ darwin ++ windows; + broken = !(stdenv.isLinux && stdenv.isx86_64); + mainProgram = "tlclient"; + }; + } +) diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 2990037a28db..ba0db2dfd33f 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.8.2"; + version = "24.9.2"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; rev = "refs/tags/v${version}"; - hash = "sha256-rBExXotfI4uG4ns3x1cJTQ0PGABG7ZlziBrqcsa3dOg="; + hash = "sha256-nFzrOSaq0U6qapmk59iAK3N0gQag1fMaew3LtOK+neY="; }; pythonRelaxDeps = [ "validators" ]; diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix index 9ec0400e41d2..49293f49557a 100644 --- a/pkgs/by-name/tu/tuxmux/package.nix +++ b/pkgs/by-name/tu/tuxmux/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tuxmux"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "edeneast"; repo = pname; rev = "v${version}"; - hash = "sha256-WtcEPvNC1GLOfX0ULUnGHtVO8CyHWQYAPCKwsUlKEzc="; + hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8="; }; - cargoHash = "sha256-OBaFBEsFjK7Mf2zqI60q6uSG5JnZiohQg79+Fm++tK4="; + cargoHash = "sha256-ZftnJ6SYfPzwgsS44YgL9tbwL8Y+7PahI0EfFbKdlqA="; buildInputs = [ libiconv ]; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix index 28c73451a18d..3c50f83d5a5e 100644 --- a/pkgs/by-name/un/unbook/package.nix +++ b/pkgs/by-name/un/unbook/package.nix @@ -1,22 +1,24 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, calibre +{ + lib, + rustPlatform, + fetchFromGitHub, + makeWrapper, + calibre, + gitUpdater, }: rustPlatform.buildRustPackage rec { pname = "unbook"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ludios"; repo = "unbook"; rev = version; - hash = "sha256-THCPJ4zOKSXKZDa5DuqpBfBKZ96TdFEuDMVw/HmO7Eo="; + hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo="; }; - cargoHash = "sha256-EbSayNz9cPmMDQOaOiyQAYmtlnb+4jzbffm1On0BBxI="; + cargoHash = "sha256-whmp4ST89TZuxQe9fnkW98A9t3rwpTdQCej49ZsDanE="; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +26,8 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/unbook --prefix PATH : ${lib.makeBinPath [ calibre ]} ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Ebook to self-contained-HTML converter"; homepage = "https://unbook.ludios.org"; diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index d84c5e66b3eb..569ebca0c44a 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -100,9 +100,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 = "arc-swap" @@ -112,9 +112,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -195,13 +195,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -214,7 +214,7 @@ dependencies = [ "futures", "http-content-range", "itertools 0.12.1", - "memmap2 0.9.4", + "memmap2 0.9.5", "reqwest", "reqwest-middleware", "thiserror", @@ -292,9 +292,9 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14cd170d3b144de5288b99c69f30b36ee5eba837bed33f458f39c890e2049162" +checksum = "fa6f92ef9ab41a352f403f709ef0f09cda1f461795de52085cd46ed831ead02e" dependencies = [ "axoasset", "axoprocess", @@ -324,17 +324,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -471,9 +471,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -543,9 +543,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14104698cb1694d43c2ff73492468ccf2bb0b047071a9838d999eeba9e984ffa" +checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d" dependencies = [ "anyhow", "core-foundation", @@ -572,9 +572,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.15" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" dependencies = [ "jobserver", "libc", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -642,9 +642,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -655,9 +655,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.24" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" +checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" dependencies = [ "clap", ] @@ -692,7 +692,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "codspeed" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c6f324a032703f286b0fbbdb390971f914b41f3410e1615c59730e4b24ebc2" +checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97" dependencies = [ "colored", "libc", @@ -723,9 +723,9 @@ dependencies = [ [[package]] name = "codspeed-criterion-compat" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae52f6f2545ffcd2ac1308f34043eb6ab81e4c741af419b348b2325574f48ee" +checksum = "8eb1a6cb9c20e177fde58cdef97c1c7c9264eb1424fe45c4fccedc2fb078a569" dependencies = [ "codspeed", "colored", @@ -800,9 +800,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -926,9 +926,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", @@ -1334,7 +1334,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1402,9 +1402,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -1414,9 +1414,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -1626,16 +1626,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http", "hyper", "hyper-util", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1645,9 +1645,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -1675,9 +1675,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", @@ -1738,9 +1738,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -1803,9 +1803,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -1865,9 +1865,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jiff" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "362be9c702bada57298130d0565e9c389e6d4024a541692f01819e21abc3e26a" +checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb" dependencies = [ "jiff-tzdb-platform", "serde", @@ -1876,15 +1876,15 @@ dependencies = [ [[package]] name = "jiff-tzdb" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" +checksum = "91335e575850c5c4c673b9bd467b0e025f164ca59d0564f69d0c2ee0ffad4653" [[package]] name = "jiff-tzdb-platform" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" +checksum = "9835f0060a626fe59f160437bc725491a6af23133ea906500027d1bd2f8f4329" dependencies = [ "jiff-tzdb", ] @@ -1915,9 +1915,9 @@ dependencies = [ [[package]] name = "junction" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa" +checksum = "72bbdfd737a243da3dfc1f99ee8d6e166480f17ab4ac84d7c34aacd73fc7bd16" dependencies = [ "scopeguard", "windows-sys 0.52.0", @@ -1987,7 +1987,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", ] [[package]] @@ -2097,9 +2097,9 @@ dependencies = [ [[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", ] @@ -2150,7 +2150,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2312,9 +2312,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" [[package]] name = "oorandom" @@ -2342,15 +2342,15 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[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" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2395,7 +2395,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", "smallvec", "windows-targets 0.52.6", ] @@ -2468,9 +2468,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", @@ -2479,9 +2479,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" dependencies = [ "pest", "pest_generator", @@ -2489,22 +2489,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "pest_meta" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" dependencies = [ "once_cell", "pest", @@ -2544,7 +2544,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2666,9 +2666,9 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", "yansi", @@ -2784,7 +2784,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2797,7 +2797,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2817,6 +2817,7 @@ dependencies = [ "serde", "thiserror", "toml", + "toml_edit", "tracing", "url", "uv-fs", @@ -2826,9 +2827,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", @@ -2844,9 +2845,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0a9b3a42929fad8a7c3de7f86ce0814cfa893328157672680e9fb1145549c5" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", @@ -2861,15 +2862,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2969,9 +2970,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -3108,7 +3109,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.7.3", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3193,9 +3194,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.49" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cd5a1e95672f201913966f39baf355b53b5d92833431847295ae0346a5b939" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -3317,9 +3318,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3330,9 +3331,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring", @@ -3355,6 +3356,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "2.1.3" @@ -3373,9 +3387,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3415,11 +3429,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3444,7 +3458,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3470,7 +3484,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3510,22 +3524,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[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", ] [[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", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3536,14 +3550,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[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 = [ "itoa", "memchr", @@ -3706,9 +3720,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "supports-color" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" +checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" dependencies = [ "is_ci", ] @@ -3774,9 +3788,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3876,7 +3890,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3887,7 +3901,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "test-case-core", ] @@ -3909,7 +3923,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3949,7 +3963,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4063,7 +4077,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4079,9 +4093,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", @@ -4091,9 +4105,9 @@ 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", "futures-core", @@ -4126,9 +4140,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", @@ -4184,7 +4198,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4319,9 +4333,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[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-linebreak" @@ -4445,7 +4459,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uv" -version = "0.4.10" +version = "0.4.11" dependencies = [ "anstream", "anyhow", @@ -4573,7 +4587,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml", + "toml_edit", "tracing", "uv-configuration", "uv-fs", @@ -4937,7 +4951,7 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "textwrap", ] @@ -4949,12 +4963,10 @@ dependencies = [ "distribution-filename", "fs-err", "futures", - "pep440_rs", "pypi-types", "thiserror", "tokio", "tokio-util", - "tracing", "uv-normalize", "zip", ] @@ -5238,7 +5250,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.10" +version = "0.4.11" [[package]] name = "uv-virtualenv" @@ -5367,7 +5379,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -5401,7 +5413,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5452,9 +5464,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -5568,7 +5580,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5579,7 +5591,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5590,7 +5602,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5601,7 +5613,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5824,13 +5836,13 @@ checksum = "7d6ad6cbd9c6e5144971e326303f0e453b61d82e4f72067fccf23106bccd8437" [[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", "http", @@ -5883,9 +5895,9 @@ dependencies = [ [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "zerocopy" @@ -5905,7 +5917,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index c2a469cb17c3..96e5941d73f0 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.10"; + version = "0.4.11"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-JI45AoTW3k1DP6RXCl8qfe6yl16PkS8xlpvl0FUISmk="; + hash = "sha256-a8mN2wag26BSL+2b5i4P1XN34J8jt+lZm2poZQdsAzM="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/by-name/vp/vpcs/package.nix similarity index 80% rename from pkgs/applications/virtualization/vpcs/default.nix rename to pkgs/by-name/vp/vpcs/package.nix index 15f769ef9698..0b8582c54a47 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/by-name/vp/vpcs/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub -, testers -, vpcs +{ + lib, + stdenv, + fetchFromGitHub, + testers, + vpcs, }: stdenv.mkDerivation (finalAttrs: { @@ -12,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "GNS3"; repo = "vpcs"; - rev = "v${finalAttrs.version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY="; }; @@ -26,22 +27,16 @@ stdenv.mkDerivation (finalAttrs: { runHook postBuild ''; - installPhase = '' - runHook preInstall - + postInstall = '' install -D -m555 vpcs $out/bin/vpcs install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1 - - runHook postInstall ''; enableParallelBuilding = true; - passthru = { - tests.version = testers.testVersion { - package = vpcs; - command = "vpcs -v"; - }; + passthru.tests.version = testers.testVersion { + package = vpcs; + command = "vpcs -v"; }; meta = with lib; { diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/by-name/wi/win-pvdrivers/package.nix similarity index 88% rename from pkgs/applications/virtualization/driver/win-pvdrivers/default.nix rename to pkgs/by-name/wi/win-pvdrivers/package.nix index c44f101ba946..275dd5e21205 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/by-name/wi/win-pvdrivers/package.nix @@ -1,4 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: let # Upstream versioned download links are broken @@ -44,13 +48,15 @@ stdenvNoCC.mkDerivation { pname = "win-pvdrivers"; version = "unstable-2023-08-17"; - srcs = map ({hash, url}: fetchurl { - inherit hash url; - # Wait & retry up to 3 times as archive.org can closes connection - # when an HTTP client makes too many requests - curlOpts = "--retry 3 --retry-delay 5"; - }) files; - + srcs = map ( + { hash, url }: + fetchurl { + inherit hash url; + # Wait & retry up to 3 times as archive.org can closes connection + # when an HTTP client makes too many requests + curlOpts = "--retry 3 --retry-delay 5"; + } + ) files; unpackPhase = '' runHook preUnpack diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix deleted file mode 100644 index 342b1677c6de..000000000000 --- a/pkgs/common-updater/nix-update.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, nix-update }: - -{ attrPath ? null -, extraArgs ? [ ] -}: - -[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 88fcef2ddef4..0f90c2af545d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -9,6 +9,7 @@ , vala , libadwaita , libgee +, gettext , granite7 , gtk4 , networkmanager @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext meson ninja pkg-config @@ -52,6 +54,8 @@ stdenv.mkDerivation rec { switchboard ]; + strictDeps = true; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index cd95406c84d8..ea5582375abd 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -1,13 +1,112 @@ -{ fetchFromGitHub, lib, stdenv, makeWrapper, unzip, libxml2, gmp, m4, uthash, which, pkg-config }: +{ + fetchFromGitHub, + lib, + stdenv, + unzip, + libxml2, + gmp, + m4, + uthash, + which, + pkg-config, + perl, + perlPackages, + fetchurl, +}: -stdenv.mkDerivation rec { +let + # Perl packages used by this project. + # TODO: put these into global perl-packages.nix once this is submitted. + ObjectTinyRW = perlPackages.buildPerlPackage { + pname = "Object-Tiny-RW"; + version = "1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz"; + hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs="; + }; + meta = { + description = "A date object with as little code as possible (and rw accessors)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + IteratorSimple = perlPackages.buildPerlPackage { + pname = "Iterator-Simple"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; + hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; + }; + meta = { + description = "Simple iterator and utilities"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + + IteratorSimpleLookahead = perlPackages.buildPerlPackage { + pname = "Iterator-Simple-Lookahead"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz"; + hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw="; + }; + propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [ + ClassAccessor + ]); + meta = { + description = "Simple iterator with lookahead and unget"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + + AsmPreproc = perlPackages.buildPerlPackage { + pname = "Asm-Preproc"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz"; + hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M="; + }; + propagatedBuildInputs = [ + IteratorSimple + IteratorSimpleLookahead + ] ++ (with perlPackages; [ + TextTemplate + DataDump + FileSlurp + ]); + meta = { + description = "Preprocessor to be called from an assembler"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + + CPUZ80Assembler = perlPackages.buildPerlPackage { + pname = "CPU-Z80-Assembler"; + version = "2.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz"; + hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU="; + }; + buildInputs = [ AsmPreproc ] ++ (with perlPackages; [ + CaptureTiny + RegexpTrie + PathTiny + ClassAccessor + ]); + meta = { + description = "Functions to assemble a set of Z80 assembly instructions"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "z88dk"; version = "2.3"; src = fetchFromGitHub { owner = "z88dk"; repo = "z88dk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; fetchSubmodules = true; }; @@ -16,38 +115,79 @@ stdenv.mkDerivation rec { # we dont rely on build.sh : export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite export ZCCCFG=$PWD/lib/config/ + # we don't want to build zsdcc since it required network (svn) # we test in checkPhase substituteInPlace Makefile \ --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' + + # rc2014.lib not created, making corresponding tests fail. Comment out. + substituteInPlace test/suites/make.config \ + --replace 'zcc +rc2014' '#zcc +rc2014' \ + --replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000' + + # The following tests don't pass. + rm src/z80asm/t/issue_0341.t + rm src/z80asm/t/z80asm_lib.t ''; + # Parallel building is not working yet with the upstream Makefiles. + # Explicitly switch this off for now. + enableParallelBuilding = false; + + doCheck = true; checkPhase = '' - make testsuite + # Need to build libs first, Makefile deps not fully defined + make libs $makeFlags + make testsuite $makeFlags + make -k test $makeFlags ''; - #failed on Issue_1105_function_pointer_calls - doCheck = stdenv.hostPlatform.system != "aarch64-linux"; - #_FORTIFY_SOURCE requires compiling with optimization (-O) - env.NIX_CFLAGS_COMPILE = "-O"; - - short_rev = builtins.substring 0 7 src.rev; + short_rev = builtins.substring 0 7 finalAttrs.src.rev; makeFlags = [ - "git_rev=${short_rev}" - "version=${version}" - "DESTDIR=$(out)" + "git_rev=${finalAttrs.short_rev}" + "version=${finalAttrs.version}" + "PREFIX=$(out)" "git_count=0" ]; - nativeBuildInputs = [ which makeWrapper unzip pkg-config ]; - buildInputs = [ libxml2 m4 uthash gmp ]; + nativeBuildInputs = [ + which + unzip + m4 + perl + pkg-config + + # Local perl packages + AsmPreproc + CPUZ80Assembler + ObjectTinyRW + ] ++ (with perlPackages; [ + CaptureTiny + DataHexDump + ModernPerl + PathTiny + RegexpCommon + TestHexDifferences + TextDiff + RegexpTrie + ]); + + buildInputs = [ + libxml2 + uthash + gmp + ]; preInstall = '' mkdir -p $out/{bin,share} ''; - installTargets = [ "libs" "install" ]; + installTargets = [ + "libs" + "install" + ]; meta = with lib; { homepage = "https://www.z88dk.org"; @@ -56,4 +196,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.siraben ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index b9cdb622d9ca..35bccb08c015 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -3,7 +3,7 @@ let ocamlPackages = coq.ocamlPackages; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.18" "8.20"; out = "2.1.4"; } + { case = range "8.18" "8.20"; out = "2.1.7"; } { case = range "8.18" "8.19"; out = "2.1.2"; } { case = isEq "8.18"; out = "2.0.3+coq8.18"; } ] null; @@ -15,6 +15,8 @@ let ocamlPackages = coq.ocamlPackages; release."2.1.2".sha256 = "sha256-GloY68fLmIv3oiEGNWwmgKv1CMAReBuXzMTUsKOs328="; release."2.1.4".rev = "v2.1.4"; release."2.1.4".sha256 = "sha256-Vwve1sCg5OsGmhDLlOyGCwP6A8g618IzD79vLPw/JtQ="; + release."2.1.7".rev = "v2.1.7"; + release."2.1.7".sha256 = "sha256-HsLv2ziPIUK6Q5/xz8ZvaGWggUCK1AKv47U5M7SCcKU="; inherit location; }); fetched = fetch (if version != null then version else defaultVersion); in diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix deleted file mode 100644 index 303f0c60d639..000000000000 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation rec { - pname = "abseil-cpp"; - version = "20211102.0"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = version; - sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; - }; - - patches = lib.optionals stdenv.isDarwin [ - # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages - # that require a different SDK other than the default one. - ./cmake-core-foundation.patch - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxxStandard != null) [ - "-DCMAKE_CXX_STANDARD=${cxxStandard}" - ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.andersk ]; - }; -} diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 1390ba84397e..c78a3c31e0c2 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -27,9 +27,9 @@ rec { complete hardware acceleration for modern GPUs. ''; homepage = "https://www.mesa3d.org/"; - changelog = "https://www.mesa3d.org/relnotes/${version}.html"; + changelog = "https://docs.mesa3d.org/relnotes/${version}.html"; license = with lib.licenses; [ mit ]; # X11 variant, in most files platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :) + maintainers = with lib.maintainers; [ k900 primeos vcunat ]; # Help is welcome :) }; } diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 0e702510823b..259e47426b76 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pico-sdk"; - version = "1.5.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "raspberrypi"; @@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: { rev = finalAttrs.version; fetchSubmodules = withSubmodules; hash = if (withSubmodules) then - "sha256-GY5jjJzaENL3ftuU5KpEZAmEZgyFRtLwGVg3W1e/4Ho=" + "sha256-fVSpBVmjeP5pwkSPhhSCfBaEr/FEtA82mQOe/cHFh0A=" else - "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU="; + "sha256-d6mEjuG8S5jvJS4g8e90gFII3sEqUVlT2fgd9M9LUkA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 0843f8338076..30998bc2ad47 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.117"; + version = "9.2.118"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-OYbLaMtelNxohrOfb4A9NC9Zado+0qvm3i2zgkgt6p4="; + hash = "sha256-wpH3hO5ge6WiUe3DxVMPylzTdTuqrmK4+ky1JkwGBY0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 0afed2af1650..76d690b16c9c 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.5.3"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-e07moT5XKrJ8PYZFsnibxV9kxUptMNo+Q/noOkKllnI="; + hash = "sha256-Q4PlEnbdEUWYG/odD+xSG975lsRQqhOgFb//hk+PWIw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index b593fb67c567..8aec71d126e9 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.9"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-x2wzFXehwLZWkRsBv54kYa7aon02saZpBIIA1J+9Fdc="; + hash = "sha256-oZpq2qUAtqDaRhgW9SbbQY9z81VqrqXhRLmpaPto9+A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 2f93cb48fc36..f9039ea24a8e 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.117"; + version = "9.2.118"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-woIid0DdaZqn7BZJrQ3UoOfGC1cP8r+t+++Sw8ZtX80="; + hash = "sha256-vysSt1YAXjmzhhP6ZYwaxI7K8x844YBSSg9Wp2xH1pI="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/apispec-webframeworks/default.nix b/pkgs/development/python-modules/apispec-webframeworks/default.nix index 3953083d41a6..a89d12ea0d50 100644 --- a/pkgs/development/python-modules/apispec-webframeworks/default.nix +++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "apispec-webframeworks"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,12 +24,12 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = "apispec-webframeworks"; rev = "refs/tags/${version}"; - hash = "sha256-qepiaRW36quIgxBtEHMF3HN0wO6jp2uGAHgg5fJoMUY="; + hash = "sha256-V4tdqcHfYRh9VoXUTPXM3SIOogJDJB14SLj5dSd7LzU="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ apispec ] ++ apispec.optional-dependencies.yaml; + dependencies = [ apispec ] ++ apispec.optional-dependencies.yaml; nativeCheckInputs = [ aiohttp diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 2d041f545901..6d64836ee055 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.117"; + version = "9.2.118"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-eMhj+OQEfkD4AgwNEEVil7p/XoaREsM+72/bN72XnzE="; + hash = "sha256-ravf2/FyPxGw7eThzkVRTLD8zhjX5vUXzb+LVO+KVxU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index fcec9d5b2333..e75685b74768 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.40.5"; + version = "0.40.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-VOeoIv1tVcgLfDAH8NKtqyL3x5puDwdxlJ2gqw213t8="; + hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 0d352c9e2c52..3549c6986cf1 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -59,5 +59,8 @@ buildPythonPackage rec { Services. This includes S3, SQS, EC2, among others. ''; maintainers = [ ]; + # Unmaintained since 2020, archived in the beginning of May 2024 and broken + # https://github.com/boto/boto/issues/3951 + broken = true; }; } diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 368bf0fc0721..7416e254769f 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -9,6 +9,7 @@ darwin, fastapi, fetchFromGitHub, + fetchpatch, grpcio, httpx, hypothesis, @@ -69,6 +70,20 @@ buildPythonPackage rec { hash = "sha256-3FmnQEpknYNzI3WlQ3kc8qa4LFcn1zpxKDbkATU7/48="; }; + patches = [ + # Remove these on the next release + (fetchpatch { + name = "pydantic19-fastapi1.patch"; + url = "https://github.com/chroma-core/chroma/commit/d62c13da29b7bff77bd7dee887123e3c57e2c19e.patch"; + hash = "sha256-E3xmh9vQZH3NCfG6phvzM65NGwlcHmPgfU6FERKAJ60="; + }) + (fetchpatch { + name = "no-union-types-pydantic1.patch"; + url = "https://github.com/chroma-core/chroma/commit/2fd5b27903dffcf8bdfbb781a25bcecc17b27672.patch"; + hash = "sha256-nmiA/lKZVrHKXumc+J4uVRiMwrnFrz2tgMpfcay5hhw="; + }) + ]; + pythonRelaxDeps = [ "chroma-hnswlib" "orjson" diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 18eebebd220a..618624295907 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.117"; + version = "9.2.118"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-f9rb5UvkEB3SkxqFQI82m4RrY6jWnD7YTjIGLVSx4gk="; + hash = "sha256-1VIWdKQD6wtYd6LHQ7vW1Ol3W+ZGB+xHhSMZ9EiNev8="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 35be77a8a496..6f7614aa917d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.117"; + version = "9.2.118"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-yTCE0QjUoHIGW0xJvCsC01w75SxzTW2zQ/UUhSqY1mQ="; + hash = "sha256-3XucYC7FKJ0WQI6fsKxMTCIdROjZcnTKpTi3ZRfiQkU="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-WpMfHd5mHZp9hp8twYjiIbDCk61LWBF4lJpHZnnIfjk="; + hash = "sha256-izDaikc4WR/6fdgrc3TJze+DLe7NOtSNWue9HrTz18Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 35e307e7e5ac..09689a844751 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "7.6.0"; + version = "7.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-4778eTsgHxVnbJiFvZdOIXtRUeZ0S3nANEGC3eNlEpU="; + hash = "sha256-KvP3msV2qIn26pSLv0XrxnwqRx7uWcllLTJg9vig5V0="; }; pythonRelaxDeps = [ "py-serializable" ]; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 59059586c89b..41479c4f2659 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.10"; + version = "0.21.11"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-77Eu1yqCsYgRgEMxBFEmV51Tj/NGH1sFjx016fC3uMM="; + hash = "sha256-5d/IEa7IGbQ2FIAl6Y8tBJIzCNDPibmhy35CSpcWQ8A="; }; build-system = [ diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 831241312a9b..80f1b114f473 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.6"; + version = "0.11.7"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-Ee715otEKmXbXwZ2umrJN3HlIjabQao8hl6MRGqJnNw="; + hash = "sha256-0waIpsVWoABtf4M0IOie9nJDk+e75ArTVmGqYg9AlnI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 127b51a742e1..5f6c9c54f2b4 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.26.3"; + version = "3.26.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_asset"; inherit version; - hash = "sha256-RgW2cZSumJj0TtwJrQyC2tGpdEy5I4asR527/IrMMDQ="; + hash = "sha256-c/xmHAD8zXdi+2ifs4bHWPS2B49Fcnr4RqLfrpGwQzs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 6c3ff4b8214a..4fd68969054e 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.13"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_netapp"; inherit version; - hash = "sha256-XsMBVG3bb0n1X9av9xoViccohuL2OxiXC5dkadHULIw="; + hash = "sha256-XjhNY4YG51+9OTZBj3jivgA2Del7RafXCIE/ATtyqWE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 161c364694e3..f0a7efc0005f 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -16,19 +16,23 @@ buildPythonPackage rec { pname = "gpy"; - version = "1.13.1"; + version = "1.13.2"; pyproject = true; disabled = pythonOlder "3.9"; - # 1.13.0 not on PyPI yet src = fetchFromGitHub { owner = "SheffieldML"; repo = "GPy"; rev = "refs/tags/v${version}"; - hash = "sha256-ykoGdXy1uagKrP9Nqn74mDESZwKVPq6wQgnHlCznevM="; + hash = "sha256-kggXePDKJcgw8qwLIBTxbwhiLw2H4dkx7082FguKP0Y="; }; + pythonRelaxDeps = [ + "paramz" + "scipy" + ]; + nativeBuildInputs = [ setuptools ]; buildInputs = [ cython ]; propagatedBuildInputs = [ @@ -47,14 +51,18 @@ buildPythonPackage rec { done ''; + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Rounding difference break comparison + "TestGradientMultiOutputGPModel" + ]; + pythonImportsCheck = [ "GPy" ]; meta = with lib; { description = "Gaussian process framework in Python"; homepage = "https://sheffieldml.github.io/GPy"; - changelog = "https://github.com/SheffieldML/GPy/releases/tag/v.${version}"; + changelog = "https://github.com/SheffieldML/GPy/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; - broken = stdenv.isDarwin; # See inscrutable error message here: https://github.com/NixOS/nixpkgs/pull/107653#issuecomment-751527547 }; } diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 229daf9b15e2..bec0a7fefc25 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.24.7"; + version = "0.25.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-7JW98PVJy3dKn3V+JmyxCZJplFUpqPckMbOJR45ZH7o="; + hash = "sha256-N/c/aTUWHolQ1TWVOoyfQ3eCLOSX3/6qtXk1T918/wg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index fb506ab96f3c..70f8b48fce92 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hwi"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bitcoin-core"; repo = "HWI"; rev = "refs/tags/${version}"; - hash = "sha256-hpMH3Zy3/TTBYUukJQZw63f0KuE3O9G2aYcGdL6Q3eM="; + hash = "sha256-sQqft+5M+X+91bFqpUrbDRrFzpe/l1+w+pnIHwqezR8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 7076732ba63c..b372a31b2c25 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.6.6"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = "icontract"; rev = "refs/tags/v${version}"; - hash = "sha256-R5/FBfuTvXItfTlNZMSnO18Q+etnHbQyXFWpaOpOLes="; + hash = "sha256-+0h3Zb7lTxtaWTv2/MmvQCcccUKhTOxGqbqKELE8mQY="; }; preCheck = '' diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 8cd34b50f828..b9ca971b1e4c 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -8,6 +8,7 @@ ldap3, ldapdomaindump, pyasn1, + pyasn1-modules, pycryptodomex, pyopenssl, pythonOlder, @@ -18,16 +19,18 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7kA5tNKu3o9fZEeLxZ+qyGA2eWviTeqNwY8An7CQXko="; + hash = "sha256-iVh9G4NqUiDXSEjJNHV5YrOCiG3KixtKDETWk/JgBkM="; }; + pythonRelaxDeps = [ "pyopenssl" ]; + build-system = [ setuptools ]; dependencies = [ @@ -37,6 +40,7 @@ buildPythonPackage rec { ldap3 ldapdomaindump pyasn1 + pyasn1-modules pycryptodomex pyopenssl setuptools diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 7dec7e5dadd0..369495b96e29 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { psfl ]; mainProgram = "import-expression"; - maintainers = with lib.maintainers; [ lychee ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index bcb026bae11c..32a560a1a1f2 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { description = "Debugging and testing cog for discord.py bots"; homepage = "https://jishaku.readthedocs.io/en/latest"; changelog = "https://github.com/Gorialis/jishaku/releases/tag/${version}"; - maintainers = with lib.maintainers; [ lychee ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "jishaku"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index ef06e6f50755..a263fa60c152 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.10.13"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-BqVPxkQLJrVYSVvtSnq0hwC5DdcyBZyvKAULwmAagzo="; + hash = "sha256-O9nB+hxMrIJDeK6BrxmX/yr0OoIXxshKJxz9fU6b2V0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix index 7212c2c4e02b..a13f11c74206 100644 --- a/pkgs/development/python-modules/leveldb/default.nix +++ b/pkgs/development/python-modules/leveldb/default.nix @@ -1,19 +1,26 @@ { lib, - fetchPypi, buildPythonPackage, + fetchPypi, + pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "leveldb"; version = "0.201"; - format = "setuptools"; + + pyproject = true; + + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; sha256 = "1cffe776842917e09f073bd6ea5856c64136aebddbe51bd17ea29913472fecbf"; }; + nativeBuildInputs = [ setuptools ]; + meta = with lib; { homepage = "https://code.google.com/archive/p/py-leveldb/"; description = "Thread-safe Python bindings for LevelDB"; diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index 2a5ef941e1b3..e6539d7caecb 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ndspy"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RoadrunnerWMC"; repo = pname; - rev = "v${version}"; - hash = "sha256-V7phRZCA0WbUpYLgS/4nJbje/JM61RksDUZQ2pnbQyU="; + rev = "refs/tags/v${version}"; + hash = "sha256-PQONVEuh5Fg2LHr4gq0XTGcOpps/s9FSgoyDn4BCcik="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index cd68cb32c88d..d02ff6c5cccc 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.133.0"; + version = "2.134.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-oQrbUUDw2OdBQ5xypkbusW82tkxY9GQmHd61DCLMOeA="; + hash = "sha256-EHqXwTsUy2bWQ1OzogL0wQhodgcm4v6T3fz7Y+d4o4w="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 9c54fe5daf4d..5583f0a42614 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.45.1"; + version = "1.46.0"; 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-2oO87J/Z3VGmBHJE2vBEvEtKa1XHQ6uWZfQTxwzHpMk="; + hash = "sha256-f8t/6T7IwWgt3WjMMdx04dunR7i4j6FBDN/abuGlEU0="; }; build-system = [ diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index c29f3a115b0b..8717bfa11759 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.15"; + version = "1.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-4vwCxh7yCYYHXxxBpWqGFKr/0tcy33n5Q8LqJl9yOuk="; + hash = "sha256-v6n+zsiLEQHeAeSALDxu4FWwwQaD/zu3rwxIjR57Ly4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/portion/default.nix b/pkgs/development/python-modules/portion/default.nix index 51ca2c119026..6af448dccd05 100644 --- a/pkgs/development/python-modules/portion/default.nix +++ b/pkgs/development/python-modules/portion/default.nix @@ -1,32 +1,25 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, - wheel, sortedcontainers, pytestCheckHook, }: buildPythonPackage rec { pname = "portion"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "AlexandreDecan"; repo = "portion"; rev = "refs/tags/${version}"; - hash = "sha256-URoyuE0yivUqPjJZbvATkAnTxicY4F2eiJ16rIUdY3Y="; + hash = "sha256-sNOieFenrWh6iDXCyCBedx+qIsS+daAr+WVBpkc8yVQ="; }; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ sortedcontainers ]; @@ -34,11 +27,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Portion, a Python library providing data structure and operations for intervals"; homepage = "https://github.com/AlexandreDecan/portion"; changelog = "https://github.com/AlexandreDecan/portion/blob/${src.rev}/CHANGELOG.md"; - license = licenses.lgpl3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/pwndbg/default.nix b/pkgs/development/python-modules/pwndbg/default.nix index 110fd273fbe1..f71117d7497a 100644 --- a/pkgs/development/python-modules/pwndbg/default.nix +++ b/pkgs/development/python-modules/pwndbg/default.nix @@ -19,33 +19,16 @@ gdb-pt-dump, poetry-core, }: -let - # The newest gdb-pt-dump is incompatible with pwndbg 2024.02.14. - # See https://github.com/martinradev/gdb-pt-dump/issues/29 - gdb-pt-dump' = gdb-pt-dump.overrideAttrs (oldAttrs: { - version = "0-unstable-2023-11-11"; - - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "89ea252f6efc5d75eacca16fc17ff8966a389690"; - hash = "sha256-i+SAcZ/kgfKstJnkyCVMh/lWtrJJOHTYoJH4tVfYHrE="; - }; - - # This revision relies on the package being imported from within GDB, which - # won't work with pythonImportsCheck. - pythonImportsCheck = [ ]; - }); -in buildPythonPackage rec { pname = "pwndbg"; - version = "2024.02.14"; + version = "2024.08.29"; pyproject = true; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - hash = "sha256-/pDo2J5EtpWWCurD7H34AlTlQi7WziIRRxHxGm3K2yk="; + hash = "sha256-mpkUEP0GBwOfbbpogupmDvCo8dkbSGy1YtH8T55rX9g="; }; nativeBuildInputs = [ @@ -68,7 +51,7 @@ buildPythonPackage rec { tabulate typing-extensions unicorn - gdb-pt-dump' + gdb-pt-dump ]; meta = { diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index a11d99332351..140a13f6678d 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.13.6"; + version = "2.13.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fredrike"; repo = "pydaikin"; rev = "refs/tags/v${version}"; - hash = "sha256-b1dvPrtvYJuTZNUase4GgXFGq69QKJZoxUr2iuYShxk="; + hash = "sha256-pLr878LbflRlHzDjarwDLQFHbRZjRvlAZEqP1tfVBNA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix index 3e4d7c24a4da..b0d7af3acaef 100644 --- a/pkgs/development/python-modules/pysmlight/default.nix +++ b/pkgs/development/python-modules/pysmlight/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.0.16"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; rev = "refs/tags/v${version}"; - hash = "sha256-TjFMK14uWkguZpF5siWG/zoOBUuCxtDnfX7+QpRKDh8="; + hash = "sha256-qpE2bKEuCfhELKtYEstGAL5h01J/8qH3mE5c0LQtaHE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index fbf8c658ca41..eb08b2e9873e 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.7.6"; + version = "1.7.7"; pyproject = true; src = fetchFromGitHub { owner = "lilohuang"; repo = "PyTurboJPEG"; rev = "refs/tags/v${version}"; - hash = "sha256-dRogPQcDKRgHDiP7fA8uRCV65cUheuF4ZQfKSd+TKd4="; + hash = "sha256-JPjGZGVMZH6sDNRdV6kWsCpEjLT2aMrTy+bI4mRbdpw="; }; patches = [ (substituteAll { src = ./lib-path.patch; - libturbojpeg = "${libjpeg_turbo.out}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; + libturbojpeg = "${lib.getLib libjpeg_turbo}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 5126815dbb0a..4fe56684d50e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.117"; + version = "9.2.118"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-hW5uCploPx7+Q8RYZSm6bp/SkbPftkfMkhLvBjHJuBc="; + hash = "sha256-LRJSecKAQAg5Axfi8h//cc3xozOiPUkZD49VJIE6shE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index a299e2caa3ba..f38927594aa7 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.8.65"; + version = "2024.9.66"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-lC31v6WLNk0RZDFz1GOlqrd2kAijTHffZ7NsUsm2vAk="; + hash = "sha256-Vx5ShmEARDfQtIldTQuL0LkLUdo0QE/ANsLa4yq3OXo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index f8f7bfdcc258..5d5a474d49dd 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-GZSq+Zlv/EUBmFZUXoF9UnrVcnYvGvdq1mmuTnhvz9Y="; + hash = "sha256-LaTzHub21e+qDQs4/sxCIVzaE8leAVs8y4P1jighkT8="; }; cp311 = { - hash = "sha256-WHr1cMvl9s7cqFTxUQd0DmPGcge+6QBxPLLuOPbr8g8="; + hash = "sha256-Iym0IdxjsC4w5GV497RQfufdjMV/NbdGgQG9xkdy+js="; }; cp312 = { - hash = "sha256-LKGg3kHURi/XZFmKWYHPVfyVVZnzj5oa4Qho6Uxt2A0="; + hash = "sha256-KXAxrkdyHKzX9pgpTTZ2PiwsXEeac0BFG6dQOkJ0seU="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 4c97f1d8ae34..a2fe1808201b 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -56,7 +56,7 @@ let pname = "ray"; - version = "2.35.0"; + version = "2.36.0"; in buildPythonPackage rec { inherit pname version; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 7b870da88879..2b0177ffc3c4 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -1,35 +1,41 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies huggingface-hub, nltk, numpy, - pytestCheckHook, - pythonOlder, scikit-learn, scipy, sentencepiece, - setuptools, tokenizers, torch, - torchvision, tqdm, transformers, + + # tests + accelerate, + datasets, + pytestCheckHook, + pytest-cov, }: buildPythonPackage rec { pname = "sentence-transformers"; - version = "2.7.0"; + version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-xER+WHprW83KWJ0bom+lTn0HNU7PgGROnp/QLG1uUcw="; + hash = "sha256-Kp0B3+1zK45KypCaxH02U/JdzTBGwFAoxtmzek94QNI="; }; build-system = [ setuptools ]; @@ -43,39 +49,56 @@ buildPythonPackage rec { sentencepiece tokenizers torch - torchvision tqdm transformers ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + accelerate + datasets + pytestCheckHook + pytest-cov + ]; pythonImportsCheck = [ "sentence_transformers" ]; disabledTests = [ # Tests require network access - "test_simple_encode" - "test_paraphrase_mining" "test_cmnrl_same_grad" "test_LabelAccuracyEvaluator" + "test_model_card_reuse" + "test_paraphrase_mining" "test_ParaphraseMiningEvaluator" + "test_simple_encode" + "test_trainer" + "test_trainer_invalid_column_names" + "test_trainer_multi_dataset_errors" ]; disabledTestPaths = [ # Tests require network access + "tests/evaluation/test_information_retrieval_evaluator.py" + "tests/test_compute_embeddings.py" + "tests/test_cross_encoder.py" + "tests/test_model_card_data.py" + "tests/test_multi_process.py" "tests/test_pretrained_stsb.py" "tests/test_sentence_transformer.py" - "tests/test_compute_embeddings.py" - "tests/test_multi_process.py" - "tests/test_cross_encoder.py" "tests/test_train_stsb.py" ]; - meta = with lib; { + # Sentence-transformer needs a writable hf_home cache + postInstall = '' + export HF_HOME=$(mktemp -d) + ''; + + meta = { description = "Multilingual Sentence & Image Embeddings with BERT"; homepage = "https://github.com/UKPLab/sentence-transformers"; changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dit7ya ]; + # Segmentation fault at import + broken = stdenv.hostPlatform.system == "x86_64-darwin"; }; } diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 9ed70a0cb090..4764b5ff573f 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -5,8 +5,8 @@ defusedxml, fetchFromGitHub, httpx, + mashumaro, poetry-core, - pydantic, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "sfrbox-api"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,20 +24,19 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "sfrbox-api"; rev = "refs/tags/v${version}"; - hash = "sha256-xvtusgqCseXAmiPQBFFZnRS9KmuhzHhZUAj5aaqyFrE="; + hash = "sha256-Ec3UOserFijBK6goyM6AMOekfLgjBq8l/9sMKYnj240="; }; pythonRelaxDeps = [ "defusedxml" - "pydantic" ]; build-system = [ poetry-core ]; dependencies = [ defusedxml + mashumaro httpx - pydantic ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 3a5573a50bb4..ce57cb147a30 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.32.0"; + version = "3.33.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-lAFisE1So1h7xWzqZHbv1iJrVckzxT4vEU7mA2Vc7oA="; + hash = "sha256-S41OyTyFjEfKvTlKwxHq7P/uzWreMIHimI6pECItTzo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index cdf0c3d9a2a4..0dd9835e617b 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -5,19 +5,20 @@ certifi, cffi, charset-normalizer, + cryptography, cython, - fetchPypi, + fetchFromGitHub, filelock, idna, keyring, - oscrypto, packaging, pandas, platformdirs, pyarrow, - pycryptodomex, pyjwt, pyopenssl, + pytest-xdist, + pytestCheckHook, pythonOlder, pytz, requests, @@ -25,7 +26,6 @@ sortedcontainers, tomlkit, typing-extensions, - wheel, }: buildPythonPackage rec { @@ -35,30 +35,28 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "snowflake_connector_python"; - inherit version; - hash = "sha256-/ZvCqxv1OE0si2W8ALsEdVV9UvBHenESkzSqtT+Wef0="; + src = fetchFromGitHub { + owner = "snowflakedb"; + repo = "snowflake-connector-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-A6QnKCROd1vJpFCTrLEoHVo43xojdjpgYS3qQm64gcY="; }; build-system = [ cython setuptools - wheel ]; - dependencies = [ asn1crypto certifi cffi charset-normalizer + cryptography filelock idna - oscrypto packaging platformdirs - pycryptodomex pyjwt pyopenssl pytz @@ -68,7 +66,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas pyarrow @@ -76,9 +74,35 @@ buildPythonPackage rec { secure-local-storage = [ keyring ]; }; - # Tests require encrypted secrets, see - # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters - doCheck = false; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; + + disabledTestPaths = [ + # Tests require encrypted secrets, see + # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters + "test/extras/simple_select1.py" + "test/integ" + # error getting schema from stream, error code: 0, error info: Expected to + # be able to read 19504 bytes for message body but got 19503 + "test/unit/test_connection.py" + "test/unit/test_cursor.py" + "test/unit/test_error_arrow_stream.py" + "test/unit/test_ocsp.py" + "test/unit/test_retry_network.py" + "test/unit/test_s3_util.py" + ]; + + disabledTests = [ + # Tests connect to the internet + "test_status_when_num_of_chunks_is_zero" + "test_test_socket_get_cert" + ]; pythonImportsCheck = [ "snowflake" diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 794d11c090a3..72deddbe1421 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.1232"; + version = "3.0.1233"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-aPqhdOJH+cOqohf6zvo5X5nf+Kb6HLZ+UCc3SQ13C6w="; + hash = "sha256-PGchoNGaynhKSRxWtW/vV6q1+9mZFTqNOi8hksbIlw0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index e8a8169a7304..9e854fc168d6 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.7.5"; + version = "0.7.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-9klPi+nscylkhvWRSqegT7aCBSH2/wc39u6aNJwpicU="; + hash = "sha256-jExS2bnxz35mqzN2f6qrqInpoNWGUYLzueKeXp//9/8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index cd322ecfacde..387ee633264e 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -11,38 +11,43 @@ ocl-icd, stdenv, rocmPackages, + # build-system setuptools, - wheel, + # dependencies numpy, - tqdm, - # nativeCheckInputs + + # tests + blobfile, + bottle, clang, hexdump, hypothesis, librosa, onnx, pillow, + pydot, pytest-xdist, pytestCheckHook, safetensors, sentencepiece, tiktoken, torch, + tqdm, transformers, }: buildPythonPackage rec { pname = "tinygrad"; - version = "0.9.0"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "tinygrad"; repo = "tinygrad"; rev = "refs/tags/v${version}"; - hash = "sha256-opBxciETZruZjHqz/3vO7rogzjvVJKItulIiok/Zs2Y="; + hash = "sha256-fCKtJhZtqq6yjc6m41uvikzM9GArUlB8Q7jN/Np8+SM="; }; patches = [ @@ -62,29 +67,20 @@ buildPythonPackage rec { substituteInPlace tinygrad/runtime/autogen/opencl.py \ --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" '' - # hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5. - # We are not sure that this works. Remove when rocm gets updated to version 6. + lib.optionalString rocmSupport '' - substituteInPlace extra/hip_gpu_driver/hip_ioctl.py \ - --replace-fail "processor = platform.processor()" "processor = ${stdenv.hostPlatform.linuxArch}" substituteInPlace tinygrad/runtime/autogen/hip.py \ --replace-fail "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \ --replace-fail "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \ - --replace-fail "hipGetDevicePropertiesR0600" "hipGetDeviceProperties" substituteInPlace tinygrad/runtime/autogen/comgr.py \ --replace-fail "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so" ''; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ numpy - tqdm ] ++ lib.optionals stdenv.isDarwin [ # pyobjc-framework-libdispatch @@ -94,18 +90,22 @@ buildPythonPackage rec { pythonImportsCheck = [ "tinygrad" ]; nativeCheckInputs = [ + blobfile + bottle clang hexdump hypothesis librosa onnx pillow + pydot pytest-xdist pytestCheckHook safetensors sentencepiece tiktoken torch + tqdm transformers ]; @@ -115,6 +115,10 @@ buildPythonPackage rec { disabledTests = [ + # flaky: https://github.com/tinygrad/tinygrad/issues/6542 + # TODO: re-enable when https://github.com/tinygrad/tinygrad/pull/6560 gets merged + "test_broadcastdot" + # Require internet access "test_benchmark_openpilot_model" "test_bn_alone" @@ -129,12 +133,14 @@ buildPythonPackage rec { "test_e2e_big" "test_fetch_small" "test_huggingface_enet_safetensors" + "test_index_mnist" "test_linear_mnist" "test_load_convnext" "test_load_enet" "test_load_enet_alt" "test_load_llama2bfloat" "test_load_resnet" + "test_mnist_val" "test_openpilot_model" "test_resnet" "test_shufflenet" @@ -148,32 +154,28 @@ buildPythonPackage rec { ] # Fail on aarch64-linux with AssertionError ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - "test_casts_to" - "test_casts_to" - "test_int8_to_uint16_negative" - "test_casts_to" - "test_casts_to" "test_casts_from" "test_casts_to" "test_int8" - "test_casts_to" + "test_int8_to_uint16_negative" ]; - disabledTestPaths = - [ - # Require internet access - "test/models/test_mnist.py" - "test/models/test_real_world.py" - "test/testextra/test_lr_scheduler.py" - ] - ++ lib.optionals (!rocmSupport) [ "extra/hip_gpu_driver/" ]; + disabledTestPaths = [ + # Require internet access + "test/models/test_mnist.py" + "test/models/test_real_world.py" + "test/testextra/test_lr_scheduler.py" - meta = with lib; { + # Files under this directory are not considered as tests by upstream and should be skipped + "extra/" + ]; + + meta = { description = "Simple and powerful neural network framework"; homepage = "https://github.com/tinygrad/tinygrad"; changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; # Requires unpackaged pyobjc-framework-libdispatch and pyobjc-framework-metal broken = stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch b/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch index 6b77173b4ecc..db74eab45bc0 100644 --- a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch +++ b/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch @@ -1,32 +1,49 @@ diff --git a/tinygrad/runtime/autogen/cuda.py b/tinygrad/runtime/autogen/cuda.py -index 359083a9..3cd5f7be 100644 +index a30c8f53..e2078ff6 100644 --- a/tinygrad/runtime/autogen/cuda.py +++ b/tinygrad/runtime/autogen/cuda.py -@@ -143,10 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): - return ctypes.cast(string, ctypes.POINTER(ctypes.c_char)) +@@ -145,7 +145,19 @@ def char_pointer_cast(string, encoding='utf-8'): -+NAME_TO_PATHS = { -+ "libcuda.so": ["@driverLink@/lib/libcuda.so"], -+ "libnvrtc.so": ["@libnvrtc@"], -+} -+def _try_dlopen(name): -+ try: -+ return ctypes.CDLL(name) -+ except OSError: -+ pass -+ for candidate in NAME_TO_PATHS.get(name, []): -+ try: -+ return ctypes.CDLL(candidate) -+ except OSError: -+ pass -+ raise RuntimeError(f"{name} not found") - _libraries = {} -_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) --_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) -+_libraries['libcuda.so'] = _try_dlopen('libcuda.so') -+_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') ++libcuda = None ++try: ++ libcuda = ctypes.CDLL('libcuda.so') ++except OSError: ++ pass ++try: ++ libcuda = ctypes.CDLL('@driverLink@/lib/libcuda.so') ++except OSError: ++ pass ++if libcuda is None: ++ raise RuntimeError(f"`libcuda.so` not found") ++ ++_libraries['libcuda.so'] = libcuda cuuint32_t = ctypes.c_uint32 +diff --git a/tinygrad/runtime/autogen/nvrtc.py b/tinygrad/runtime/autogen/nvrtc.py +index 6af74187..c5a6c6c4 100644 +--- a/tinygrad/runtime/autogen/nvrtc.py ++++ b/tinygrad/runtime/autogen/nvrtc.py +@@ -10,7 +10,18 @@ import ctypes, ctypes.util + + + _libraries = {} +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++libnvrtc = None ++try: ++ libnvrtc = ctypes.CDLL('libnvrtc.so') ++except OSError: ++ pass ++try: ++ libnvrtc = ctypes.CDLL('@libnvrtc@') ++except OSError: ++ pass ++if libnvrtc is None: ++ raise RuntimeError(f"`libnvrtc.so` not found") ++_libraries['libnvrtc.so'] = ctypes.CDLL(libnvrtc) + def string_cast(char_pointer, encoding='utf-8', errors='strict'): + value = ctypes.cast(char_pointer, ctypes.c_char_p).value + if value is not None and encoding is not None: diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 33680d968969..826888a528ae 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.3.0"; + version = "9.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-v+Xq2t9eaKHLQFypNUTzLVBLo+3m0bKkjI09jwD3ieQ="; + hash = "sha256-yQrWMRLH8GZYmpmhjW2Lomk6qyKydWsteCvFR0uDPRQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 55aefbd5fd39..7e6986f2a95a 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.1.0.20240417"; + version = "2024.2.0.20240913"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-aBDIofaPIf3w9PN0pDJIfHdkWgrAsx3kv0aQzyGtOYE="; + hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/unifi-ap/default.nix b/pkgs/development/python-modules/unifi-ap/default.nix new file mode 100644 index 000000000000..f5bfb6088bc0 --- /dev/null +++ b/pkgs/development/python-modules/unifi-ap/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + paramiko, +}: + +buildPythonPackage rec { + pname = "unifi-ap"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tofuSCHNITZEL"; + repo = "unifi_ap"; + rev = "v${version}"; + hash = "sha256-dEaDRcQEx+n+zvxVHD58B1AdFj004L76AtVDesnP+gQ="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ "paramiko" ]; + + dependencies = [ + paramiko + ]; + + pythonImportsCheck = [ + "unifi_ap" + ]; + + doCheck = false; # no tests + + meta = { + changelog = "https://github.com/tofuSCHNITZEL/unifi_ap/releases/tag/v${version}"; + description = "Python API for UniFi accesspoints"; + homepage = "https://github.com/tofuSCHNITZEL/unifi_ap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index 32b79b3e22ce..007aaab546ad 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-VXChH9iMrRu8YiCz5yP92K38XF4AhlIJ6IrwP/SqFUs="; + hash = "sha256-6l1PuBeMKrRpz0+kbQzrFsyzeNpG27woqLnB7r3MxlU="; }; build-system = [ diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 60478666faa9..f8c83870f9f1 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.32"; + version = "0.0.33"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-DIVzgTAlxzYqEPrLeX5e1At9EiEm0z+CzZ2bulgWINU="; + hash = "sha256-qcXKHIiEm1wqcQKRH+TqgQMPZbLqNnBiR6dbmLwxW1Y="; }; postPatch = '' diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index c6d285a4cae4..ccd57d05895c 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.33"; + version = "0.8.34"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-S3OK9qPnI8E1v5h9Tzx9cOZJVwPpYL4qs9JN0Uj6jzQ="; + hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY="; }; - vendorHash = "sha256-EYe1hjxlaqVbie4yOsnlzWxQDyxmj8+cbhCUdR9ObeQ="; + vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index e2c2e9293d21..a8243353adea 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "2.0.0-preview.2"; + version = "2.0.0-preview.3"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-GrgBDuyXnwmaq55LWTnNGsichfoQ+/arSxLhl3ymbDM="; + hash = "sha256-BSLUhXxZyffH6HX3RR6PqXts76ERa0bpct/qs0Sf0NE="; }; - cargoHash = "sha256-7AdaUz43GHHhS1WoOD7qT4ZleBXc+Sp2/7/UHcSppTs="; + cargoHash = "sha256-jj1ytX44XoNKR+TCn/MpWk8CFM/DvHSwyfjVe3ca+AA="; buildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/devpod/Cargo.lock b/pkgs/development/tools/devpod/Cargo.lock index 8b7d57a658b6..45bf51a8f488 100644 --- a/pkgs/development/tools/devpod/Cargo.lock +++ b/pkgs/development/tools/devpod/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -24,10 +24,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "1.1.2" +name = "ahash" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -64,9 +75,28 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arboard" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +dependencies = [ + "clipboard-win", + "core-graphics 0.23.2", + "image 0.25.2", + "log", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "windows-sys 0.48.0", + "wl-clipboard-rs", + "x11rb", +] [[package]] name = "arrayvec" @@ -75,23 +105,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] -name = "async-broadcast" -version = "0.5.1" +name = "arrayvec" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -99,64 +136,42 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", + "futures-lite", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" -dependencies = [ - "async-lock 3.2.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "parking", - "polling 3.3.1", - "rustix 0.38.26", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -164,85 +179,79 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" -dependencies = [ - "event-listener 4.0.0", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.26", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ - "async-io 2.2.1", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.26", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -266,7 +275,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -277,27 +286,27 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[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" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.5", + "base64 0.21.7", "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.0.1", + "hyper 1.4.1", "hyper-util", - "itoa 1.0.9", + "itoa 1.0.11", "matchit", "memchr", "mime", @@ -309,39 +318,41 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tokio-tungstenite", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -360,9 +371,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" @@ -372,9 +389,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] [[package]] name = "block" @@ -392,26 +421,56 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.5.1" +name = "block2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.2.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", - "tracing", +] + +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases 0.2.1", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.72", + "syn_derive", ] [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -430,9 +489,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -440,25 +499,48 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-unit" -version = "4.0.19" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" dependencies = [ + "rust_decimal", "serde", "utf8-width", ] [[package]] -name = "bytemuck" -version = "1.14.0" +name = "bytecheck" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -467,10 +549,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.5.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -496,7 +584,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -511,12 +599,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" [[package]] name = "cesu8" @@ -546,9 +631,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -561,10 +646,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.31" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[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", @@ -572,7 +669,16 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", ] [[package]] @@ -585,8 +691,8 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.22.3", + "foreign-types 0.3.2", "libc", "objc", ] @@ -613,9 +719,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -623,9 +729,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -661,7 +767,20 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", "libc", ] @@ -678,64 +797,55 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[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", ] [[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.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -771,24 +881,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "ctor" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "darling" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -796,67 +906,67 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", ] [[package]] -name = "derivative" -version = "2.2.0" +name = "derive-new" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -869,7 +979,7 @@ dependencies = [ "cocoa", "dirs", "dispatch", - "http 1.0.0", + "http 1.1.0", "lazy_static", "log", "objc", @@ -955,6 +1065,21 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.5", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + [[package]] name = "dtoa" version = "1.0.9" @@ -963,9 +1088,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" dependencies = [ "dtoa", ] @@ -978,15 +1103,16 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "embed-resource" -version = "2.4.0" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" +checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" dependencies = [ "cc", + "memchr", "rustc_version", - "toml 0.8.8", + "toml 0.8.15", "vswhom", - "winreg 0.51.0", + "winreg 0.52.0", ] [[package]] @@ -997,18 +1123,24 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] -name = "enumflags2" -version = "0.7.8" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1016,13 +1148,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -1033,36 +1165,25 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "event-listener" -version = "2.5.3" +name = "error-code" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "event-listener" -version = "3.1.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1071,34 +1192,25 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.0", + "event-listener", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1118,27 +1230,33 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] -name = "flate2" -version = "1.0.28" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1156,7 +1274,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -1165,6 +1304,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1174,6 +1319,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futf" version = "0.1.5" @@ -1186,24 +1337,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1212,32 +1363,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" -dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1246,32 +1382,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", @@ -1332,7 +1468,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1349,7 +1485,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1363,7 +1499,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1375,7 +1511,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "x11", ] @@ -1402,6 +1538,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -1415,9 +1561,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1426,9 +1572,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" @@ -1456,7 +1602,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "winapi", ] @@ -1488,7 +1634,7 @@ checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1502,7 +1648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1520,8 +1666,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1532,7 +1678,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1573,7 +1719,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1583,7 +1729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1592,36 +1738,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.1.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1633,12 +1760,15 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -1656,10 +1786,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1668,17 +1810,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "html5ever" -version = "0.25.2" +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "windows-sys 0.52.0", ] [[package]] @@ -1689,7 +1826,7 @@ checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", - "markup5ever 0.11.0", + "markup5ever", "proc-macro2", "quote", "syn 1.0.109", @@ -1697,57 +1834,57 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.9", + "itoa 1.0.11", ] [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa 1.0.9", + "itoa 1.0.11", ] [[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", ] [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", ] [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -1759,9 +1896,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1771,22 +1908,22 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", - "http 0.2.11", - "http-body 0.4.5", + "h2", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", - "itoa 1.0.9", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -1795,20 +1932,20 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.0", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "httparse", "httpdate", - "itoa 1.0.9", + "itoa 1.0.11", "pin-project-lite", + "smallvec", "tokio", ] @@ -1819,7 +1956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.27", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", @@ -1827,36 +1964,31 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.1" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", - "futures-channel", "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "hyper 1.0.1", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", - "socket2 0.5.5", "tokio", - "tower", - "tower-service", - "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1906,15 +2038,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -1922,17 +2054,29 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", "num-traits", ] +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits", + "png", + "tiff", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -1946,12 +2090,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1975,9 +2119,9 @@ dependencies = [ [[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", ] @@ -1995,17 +2139,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -2020,9 +2153,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore-rs" @@ -2068,36 +2201,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] -name = "js-sys" -version = "0.3.66" +name = "jpeg-decoder" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-patch" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", "thiserror", - "treediff", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever 0.25.2", - "matches", - "selectors", ] [[package]] @@ -2107,7 +2233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" dependencies = [ "cssparser", - "html5ever 0.26.0", + "html5ever", "indexmap 1.9.3", "matches", "selectors", @@ -2115,9 +2241,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libappindicator" @@ -2139,15 +2265,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -2159,43 +2285,37 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", ] [[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" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2203,9 +2323,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] @@ -2253,20 +2373,6 @@ dependencies = [ "libc", ] -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - [[package]] name = "markup5ever" version = "0.11.0" @@ -2304,9 +2410,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -2319,9 +2425,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2332,6 +2438,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "minisign-verify" version = "0.2.1" @@ -2340,9 +2452,9 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2350,9 +2462,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -2361,11 +2473,10 @@ dependencies = [ [[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", @@ -2407,9 +2518,9 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" @@ -2423,6 +2534,31 @@ dependencies = [ "memoffset 0.7.1", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", + "memoffset 0.9.1", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -2430,10 +2566,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] -name = "notify-rust" -version = "4.10.0" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" dependencies = [ "log", "mac-notification-sys", @@ -2453,31 +2599,16 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[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", ] @@ -2488,7 +2619,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -2507,7 +2638,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -2515,9 +2646,9 @@ dependencies = [ [[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", ] @@ -2545,9 +2676,9 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -2556,7 +2687,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", - "objc2-encode", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", ] [[package]] @@ -2565,6 +2746,49 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2585,18 +2809,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" @@ -2610,13 +2834,13 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -2631,7 +2855,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -2642,9 +2866,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2670,23 +2894,23 @@ dependencies = [ [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", "serde", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "os_pipe" -version = "1.1.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2717,7 +2941,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -2728,9 +2952,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2738,15 +2962,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2761,6 +2985,16 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.2.6", +] + [[package]] name = "phf" version = "0.8.0" @@ -2865,7 +3099,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -2897,29 +3131,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[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" @@ -2929,40 +3163,39 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[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 = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.5", - "indexmap 2.1.0", - "line-wrap", - "quick-xml 0.31.0", + "base64 0.22.1", + "indexmap 2.2.6", + "quick-xml 0.32.0", "serde", "time", ] [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2973,30 +3206,15 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.26", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -3029,6 +3247,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3061,20 +3288,31 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] -name = "quick-xml" -version = "0.30.0" +name = "ptr_meta" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "memchr", + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -3087,14 +3325,38 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.33" +name = "quick-xml" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.7.3" @@ -3155,7 +3417,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", ] [[package]] @@ -3182,15 +3444,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -3201,26 +3454,35 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "getrandom 0.2.11", + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3234,13 +3496,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -3251,25 +3513,34 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.22", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.27", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-tls", "ipnet", "js-sys", @@ -3279,9 +3550,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -3320,10 +3593,55 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.23" +name = "rkyv" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec 0.7.4", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -3336,48 +3654,37 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" -dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] -name = "rustversion" -version = "1.0.14" +name = "rustls-pemfile" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3390,11 +3697,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3410,12 +3717,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "security-framework" -version = "2.9.2" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3424,9 +3737,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3454,51 +3767,52 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "itoa 1.0.9", + "indexmap 2.2.6", + "itoa 1.0.11", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ - "itoa 1.0.9", + "itoa 1.0.11", "serde", ] @@ -3515,20 +3829,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3540,23 +3854,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.9", + "itoa 1.0.11", "ryu", "serde", ] [[package]] name = "serde_with" -version = "3.4.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ - "base64 0.21.5", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -3564,24 +3879,24 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.1.0", - "itoa 1.0.9", + "indexmap 2.2.6", + "itoa 1.0.11", "ryu", "serde", "unsafe-libyaml", @@ -3662,9 +3977,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3675,6 +3990,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "siphasher" version = "0.3.11" @@ -3692,28 +4013,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[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]] @@ -3802,9 +4113,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" @@ -3819,21 +4130,39 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "sync_wrapper" 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 = "sys-locale" version = "0.2.4" @@ -3883,29 +4212,29 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr 0.15.5", - "heck 0.4.1", + "cfg-expr 0.15.8", + "heck 0.5.0", "pkg-config", - "toml 0.8.8", - "version-compare 0.1.1", + "toml 0.8.15", + "version-compare 0.2.0", ] [[package]] name = "tao" -version = "0.16.5" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" +checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" dependencies = [ "bitflags 1.3.2", "cairo-rs", "cc", "cocoa", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dirs-next", "dispatch", @@ -3918,7 +4247,7 @@ dependencies = [ "glib", "glib-sys", "gtk", - "image", + "image 0.24.9", "instant", "jni", "lazy_static", @@ -3939,7 +4268,7 @@ dependencies = [ "unicode-segmentation", "uuid", "windows 0.39.0", - "windows-implement", + "windows-implement 0.39.0", "x11-dl", ] @@ -3955,10 +4284,16 @@ dependencies = [ ] [[package]] -name = "tar" -version = "0.4.40" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -3967,34 +4302,38 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "tauri" -version = "1.5.3" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d563b672acde8d0cc4c1b1f5b855976923f67e8d6fe1eba51df0211e197be2" +checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "bytes", "cocoa", "dirs-next", + "dunce", "embed_plist", "encoding_rs", "flate2", "futures-util", + "getrandom 0.2.15", "glib", "glob", "gtk", - "heck 0.4.1", - "http 0.2.11", + "heck 0.5.0", + "http 0.2.12", "ico 0.2.0", "ignore", + "indexmap 1.9.3", "infer 0.9.0", "minisign-verify", + "nix 0.26.4", "notify-rust", "objc", "once_cell", @@ -4034,14 +4373,14 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.5.0" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" dependencies = [ "anyhow", "cargo_toml", "dirs-next", - "heck 0.4.1", + "heck 0.5.0", "json-patch", "semver", "serde", @@ -4053,11 +4392,11 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.1" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb" +checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "brotli", "ico 0.3.0", "json-patch", @@ -4079,11 +4418,11 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acea6445eececebd72ed7720cfcca46eee3b5bad8eb408be8f7ef2e3f7411500" +checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 1.0.109", @@ -4100,7 +4439,7 @@ dependencies = [ "dirs", "interprocess", "log", - "objc2", + "objc2 0.4.1", "once_cell", "tauri-utils", "windows-sys 0.48.0", @@ -4110,7 +4449,7 @@ dependencies = [ [[package]] name = "tauri-plugin-log" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#6ca80db9ac3ebd4031968f50a85f7df524d641a3" dependencies = [ "byte-unit", "fern", @@ -4125,7 +4464,7 @@ dependencies = [ [[package]] name = "tauri-plugin-store" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#6ca80db9ac3ebd4031968f50a85f7df524d641a3" dependencies = [ "log", "serde", @@ -4136,12 +4475,12 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.1" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43" +checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" dependencies = [ "gtk", - "http 0.2.11", + "http 0.2.12", "http-range", "rand 0.8.5", "raw-window-handle", @@ -4157,10 +4496,11 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.2" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803a01101bc611ba03e13329951a1bde44287a54234189b9024b78619c1bc206" +checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" dependencies = [ + "arboard", "cocoa", "gtk", "percent-encoding", @@ -4177,16 +4517,16 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52165bb340e6f6a75f1f5eeeab1bb49f861c12abe3a176067d53642b5454986" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" dependencies = [ "brotli", "ctor", "dunce", "glob", - "heck 0.4.1", - "html5ever 0.26.0", + "heck 0.5.0", + "html5ever", "infer 0.13.0", "json-patch", "kuchikiki", @@ -4217,25 +4557,25 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", + "quick-xml 0.31.0", + "windows 0.56.0", + "windows-version", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.26", - "windows-sys 0.48.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -4251,9 +4591,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -4266,43 +4606,55 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[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", ] [[package]] -name = "time" -version = "0.3.30" +name = "tiff" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.9", + "itoa 1.0.11", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -4318,18 +4670,19 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4348,9 +4701,9 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.34.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -4359,10 +4712,22 @@ dependencies = [ "num_cpus", "parking_lot", "pin-project-lite", - "socket2 0.5.5", + "socket2", + "tokio-macros", "windows-sys 0.48.0", ] +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "tokio-native-tls" version = "0.3.1" @@ -4375,9 +4740,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -4387,16 +4752,15 @@ 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-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4422,21 +4786,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -4447,24 +4811,35 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.14", ] [[package]] @@ -4485,14 +4860,14 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "bytes", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "pin-project-lite", "tower-layer", @@ -4531,7 +4906,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -4574,19 +4949,24 @@ dependencies = [ ] [[package]] -name = "treediff" -version = "4.0.2" +name = "tree_magic_mini" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" dependencies = [ - "serde_json", + "fnv", + "home", + "memchr", + "nom", + "once_cell", + "petgraph", ] [[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 = "ts-rs" @@ -4614,14 +4994,14 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.11", + "http 1.1.0", "httparse", "log", "rand 0.8.5", @@ -4639,19 +5019,20 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.1", "tempfile", "winapi", ] [[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" @@ -4661,30 +5042,30 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4706,17 +5087,17 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.6.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", ] [[package]] @@ -4727,9 +5108,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vcpkg" @@ -4745,9 +5126,9 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -4781,32 +5162,26 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" dependencies = [ - "arrayvec", + "arrayvec 0.5.2", "utf8parse", "vte_generate_state_changes", ] [[package]] name = "vte_generate_state_changes" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2", "quote", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4835,9 +5210,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4845,24 +5220,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4872,9 +5247,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4882,28 +5257,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -4913,10 +5288,83 @@ dependencies = [ ] [[package]] -name = "web-sys" -version = "0.3.66" +name = "wayland-backend" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +dependencies = [ + "proc-macro2", + "quick-xml 0.34.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4966,7 +5414,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -4978,7 +5426,7 @@ dependencies = [ "webview2-com-macros", "webview2-com-sys", "windows 0.39.0", - "windows-implement", + "windows-implement 0.39.0", ] [[package]] @@ -5007,6 +5455,12 @@ dependencies = [ "windows-metadata", ] +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + [[package]] name = "winapi" version = "0.3.9" @@ -5025,11 +5479,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5069,7 +5523,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" dependencies = [ - "windows-implement", + "windows-implement 0.39.0", "windows_aarch64_msvc 0.39.0", "windows_i686_gnu 0.39.0", "windows_i686_msvc 0.39.0", @@ -5088,12 +5542,12 @@ dependencies = [ [[package]] name = "windows" -version = "0.51.1" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core", - "windows-targets 0.48.5", + "windows-core 0.56.0", + "windows-targets 0.52.6", ] [[package]] @@ -5108,11 +5562,23 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -5125,12 +5591,43 @@ dependencies = [ "windows-tokens", ] +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "windows-metadata" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -5170,7 +5667,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -5205,17 +5702,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.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]] @@ -5226,11 +5724,11 @@ checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows-version" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -5247,9 +5745,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5277,9 +5775,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5307,9 +5805,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +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" @@ -5337,9 +5841,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5367,9 +5871,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5385,9 +5889,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5415,15 +5919,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f" dependencies = [ "memchr", ] @@ -5440,33 +5953,53 @@ dependencies = [ [[package]] name = "winreg" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] [[package]] -name = "wry" -version = "0.24.6" +name = "wl-clipboard-rs" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744" +checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" +dependencies = [ + "derive-new", + "libc", + "log", + "nix 0.28.0", + "os_pipe", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + +[[package]] +name = "wry" +version = "0.24.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" dependencies = [ "base64 0.13.1", "block", "cocoa", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", "gio", "glib", "gtk", - "html5ever 0.25.2", - "http 0.2.11", - "kuchiki", + "html5ever", + "http 0.2.12", + "kuchikiki", "libc", "log", "objc", @@ -5483,7 +6016,16 @@ dependencies = [ "webkit2gtk-sys", "webview2-com", "windows 0.39.0", - "windows-implement", + "windows-implement 0.39.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", ] [[package]] @@ -5508,50 +6050,66 @@ dependencies = [ ] [[package]] -name = "xattr" -version = "1.0.1" +name = "x11rb" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "gethostname", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ - "nix", - "winapi", + "libc", + "windows-sys 0.52.0", ] [[package]] name = "zbus" -version = "3.14.1" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix", - "once_cell", + "nix 0.29.0", "ordered-stream", "rand 0.8.5", "serde", @@ -5560,7 +6118,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -5569,23 +6127,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -5605,13 +6162,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5619,24 +6175,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] diff --git a/pkgs/development/tools/devpod/add-tauri-updater-feature.patch b/pkgs/development/tools/devpod/add-tauri-updater-feature.patch index 3fc7ac991099..166948c78a03 100644 --- a/pkgs/development/tools/devpod/add-tauri-updater-feature.patch +++ b/pkgs/development/tools/devpod/add-tauri-updater-feature.patch @@ -7,7 +7,6 @@ index 03f64e53..9e2ddcb6 100644 # Tauri tauri = { version = "1.2.4", features = [ + "updater", + "dialog-save", "process-relaunch", "window-close", - "notification-all", - diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 596f252ba02c..75c1e27c41f3 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -80,7 +80,7 @@ rec { offlineCache = fetchYarnDeps { yarnLock = "${src}/desktop/yarn.lock"; - sha256 = "sha256-I+c0zrybNv3iS+Wy+n+NlBalA6gLYuxBw00mAJbqgfU="; + hash = "sha256-vUV4yX+UvEKrP0vHxjGwtW2WyONGqHVmFor+WqWbkCc="; }; packageJSON = ./package.json; @@ -107,7 +107,7 @@ rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-log-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U="; + "tauri-plugin-log-0.0.0" = "sha256-tM6oLJe/wwqDDNMKBeMa5nNVvsmi5b104xMOvtm974Y="; }; }; diff --git a/pkgs/development/tools/devpod/package.json b/pkgs/development/tools/devpod/package.json index 9cabd21c905f..1efadc72ce6f 100644 --- a/pkgs/development/tools/devpod/package.json +++ b/pkgs/development/tools/devpod/package.json @@ -26,7 +26,7 @@ "@tanstack/react-query": "4.36.1", "@tanstack/react-query-devtools": "4.36.1", "@tanstack/react-table": "8.10.7", - "@tauri-apps/api": "1.5.1", + "@tauri-apps/api": "1.5.3", "dayjs": "1.11.10", "framer-motion": "10.16.9", "markdown-to-jsx": "7.3.2", @@ -36,14 +36,14 @@ "react-icons": "4.12.0", "react-router": "6.20.0", "react-router-dom": "6.20.0", - "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store", + "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store#v1", "uuid": "9.0.1", "xterm": "5.3.0", "xterm-addon-fit": "0.7.0" }, "devDependencies": { "@tanstack/eslint-plugin-query": "4.36.1", - "@tauri-apps/cli": "1.5.2", + "@tauri-apps/cli": "1.5.11", "@types/node": "18.15.3", "@types/react": "18.2.28", "@types/react-dom": "18.2.13", @@ -54,10 +54,13 @@ "eslint": "8.44.0", "eslint-config-prettier": "8.8.0", "eslint-config-react-app": "7.0.1", - "eslint-plugin-react": "7.32.2", + "eslint-plugin-react": "7.34.1", "eslint-plugin-react-hooks": "4.6.0", "prettier": "3.0.3", "typescript": "5.0.4", "vite": "4.4.9" + }, + "resolutions": { + "lodash": "4.17.21" } } diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index c6f0d90416b6..213bc53abf74 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,24 +12,35 @@ }, "30": { "hashes": { - "aarch64-darwin": "3e432bd550279c2d58c6a02b0bda048fa2a9a89aef9752e22c39a518a83fe96f", - "aarch64-linux": "338f2a361448e78aa8c319cd582f2dd6d891d6c0c66b676c628e50511c27514f", - "armv7l-linux": "8cffae19618fe5f0eaff40378c40084e18f9747bbbe2d87390203a3012c98367", - "headers": "1zpl51g8d0j6xw4h2pw1wy6qlwgxj37x4lsj377kg27y809rf5ah", - "x86_64-darwin": "4d38f40ec33955dd0aef5cc0053b2b07c4744abb9f2614a44780280c4678aca9", - "x86_64-linux": "7ff1b75defc522f327c0f1bf6f4d13938b041cf5de1d7417b9dc5d1e7026e93c" + "aarch64-darwin": "3de7da4462c7690f75680aecac8fddedc4b998d0da769136d8eff2932b36004e", + "aarch64-linux": "3722d46929fd2c7b33c17d37464a08150e60d9269053eb67195795254fb5e947", + "armv7l-linux": "a786d51f834c24b768bd415bf9a2fc5c1d9abdf9dc0b1a091bf9a8ff101becfe", + "headers": "0db38ndw9rrd8ixa14761cbff6ns31b6302bzx5q4in8i4dkrrs3", + "x86_64-darwin": "d89b89f7c2ba45cb10df7fc23722bacf6f77e13002c42648762cd18ae3fa9182", + "x86_64-linux": "688e4da8dbcb7dbfacab6f29341d96736e6d06e4c8029835b83ef30b69885b01" }, - "version": "30.4.0" + "version": "30.5.1" }, "31": { "hashes": { - "aarch64-darwin": "bca203c7705e56baa5c7c2f972dd3a606ee80589514a3d83283960b67bad446c", - "aarch64-linux": "a040723dc5c7860527f2718e5b3aaf43d219e35ae391a3338c7a85de2d08afb7", - "armv7l-linux": "64306c594ad37c94e2562d3fe4832667191321f90ec797e41ceae4640da26289", - "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", - "x86_64-darwin": "47a04768ed44c4f4128d1fe90818b58cbef6da63b1112acaf2bbb7c20d22ad7d", - "x86_64-linux": "61225378c9a6097974638c241730db60230c9d774a2c7242aa9f001299bccf4b" + "aarch64-darwin": "904d665b4df7377ccdae58c35328456bf2a05a8d3e878954e48175ee60103b3f", + "aarch64-linux": "d66e80621dc8c667ca634c30c4be8486b56ebce17ba6debab5eb70dd40ed9ab9", + "armv7l-linux": "ae76cf56a793f7c98411f997db610d4729b6992e7ccbb7651a960947e87c5bb2", + "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", + "x86_64-darwin": "3ee05c812e0ce5cb0ee7a36fb1c3a52447d8bfef80a57ca82667b501a354778a", + "x86_64-linux": "65b04f0d8980c17d205644903718a4b41ba6c1fab9d25a58dadf00b6db24a402" }, - "version": "31.4.0" + "version": "31.6.0" + }, + "32": { + "hashes": { + "aarch64-darwin": "8f40b497d21a8b7d2b3df168b1cf4311f6a39acab241f05ffee0dad6409e0801", + "aarch64-linux": "f92df0fafdf1be14d38a4ed4b1555f71c922ab3c096148c71aef8a46f95e0127", + "armv7l-linux": "f8c170268d348411fa5d27642327305aeca539459615a5e7648484728f4e0eed", + "headers": "01wwikj54d3fm6bsz9z61dcl7d5mzbk48mcaycrbmq1rg0h0kk5a", + "x86_64-darwin": "5efdf72e580336e91d6d696dab79ab9b932a2eaf91ff4da744b63da24f8288ca", + "x86_64-linux": "f48ca709758744f6c1ab5062444405c1416c27b57143707bfea321116f641cec" + }, + "version": "32.1.0" } } diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 9db54c7ed676..205484f5fa70 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-I6MyeKKqAxDb2BT6Uvmudw953kof1DIrZf1zmidwURo="; + hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk="; }; - cargoHash = "sha256-tNYqUODqZSUb+p6JxZXWma5OE2v657yosObJ49Ei4+k="; + cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-edit/Cargo.lock b/pkgs/development/tools/rust/cargo-edit/Cargo.lock deleted file mode 100644 index de3cfdf9786e..000000000000 --- a/pkgs/development/tools/rust/cargo-edit/Cargo.lock +++ /dev/null @@ -1,2381 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon 1.0.2", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon 2.1.0", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstream 0.3.2", - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_fs" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" -dependencies = [ - "anstream 0.3.2", - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-edit" -version = "0.12.2" -dependencies = [ - "anyhow", - "assert_cmd", - "assert_fs", - "cargo-test-macro", - "cargo-test-support", - "cargo_metadata", - "clap", - "clap-cargo", - "concolor-control", - "crates-index", - "dunce", - "env_proxy", - "git2", - "hex", - "home", - "indexmap 1.9.3", - "native-tls", - "pathdiff", - "predicates", - "regex", - "semver", - "serde", - "serde_derive", - "serde_json", - "snapbox", - "subprocess", - "termcolor", - "toml", - "toml_edit", - "trycmd", - "ureq", - "url", -] - -[[package]] -name = "cargo-platform" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-test-macro" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" - -[[package]] -name = "cargo-test-support" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" -dependencies = [ - "anyhow", - "cargo-test-macro", - "cargo-util", - "crates-io", - "filetime", - "flate2", - "git2", - "glob", - "itertools", - "lazy_static", - "pasetors", - "serde", - "serde_json", - "snapbox", - "tar", - "termcolor", - "time", - "toml", - "url", - "windows-sys", -] - -[[package]] -name = "cargo-util" -version = "0.2.7" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" -dependencies = [ - "anyhow", - "core-foundation", - "filetime", - "hex", - "jobserver", - "libc", - "miow", - "same-file", - "sha2", - "shell-escape", - "tempfile", - "tracing", - "walkdir", - "windows-sys", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap-cargo" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" -dependencies = [ - "anstyle", - "clap", -] - -[[package]] -name = "clap_builder" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" -dependencies = [ - "anstream 0.5.0", - "anstyle", - "clap_lex", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_derive" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "concolor-control" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" -dependencies = [ - "atty", - "bitflags 1.3.2", - "concolor-query", -] - -[[package]] -name = "concolor-query" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7" - -[[package]] -name = "const-oid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" - -[[package]] -name = "content_inspector" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" -dependencies = [ - "memchr", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crates-index" -version = "0.19.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cab38e209d6ba8bd5b0d41c784ec63a5a9ea3adf866b820d377588960f1ded" -dependencies = [ - "git2", - "hex", - "home", - "memchr", - "rayon", - "rustc-hash", - "semver", - "serde", - "serde_derive", - "serde_json", - "smol_str", - "toml", -] - -[[package]] -name = "crates-io" -version = "0.39.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" -dependencies = [ - "curl", - "percent-encoding", - "serde", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ct-codecs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.65+curl-8.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" -dependencies = [ - "serde", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "ecdsa" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] -name = "ed25519-compact" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "elliptic-curve" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "env_proxy" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" -dependencies = [ - "log", - "url", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys", -] - -[[package]] -name = "flate2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" -dependencies = [ - "crc32fast", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "git2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "globwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" -dependencies = [ - "bitflags 1.3.2", - "ignore", - "walkdir", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core", - "subtle", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "humantime-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" -dependencies = [ - "humantime", - "serde", -] - -[[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 = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown 0.14.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.9", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libgit2-sys" -version = "0.15.2+1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "miow" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.2", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "openssl" -version = "0.10.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" -dependencies = [ - "bitflags 1.3.2", - "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-src" -version = "111.27.0+1.1.1v" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "orion" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462" -dependencies = [ - "fiat-crypto", - "subtle", - "zeroize", -] - -[[package]] -name = "os_pipe" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "pasetors" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" -dependencies = [ - "ct-codecs", - "ed25519-compact", - "getrandom", - "orion", - "p384", - "rand_core", - "regex", - "serde", - "serde_json", - "sha2", - "subtle", - "time", - "zeroize", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "primeorder" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.5", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.21.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.4", - "sct", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signature" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - -[[package]] -name = "smol_str" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" -dependencies = [ - "serde", -] - -[[package]] -name = "snapbox" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad90eb3a2e3a8031d636d45bd4832751aefd58a291b553f7305a2bacae21aff3" -dependencies = [ - "anstream 0.5.0", - "anstyle", - "content_inspector", - "dunce", - "filetime", - "libc", - "normalize-line-endings", - "os_pipe", - "similar", - "snapbox-macros", - "tempfile", - "wait-timeout", - "walkdir", - "windows-sys", -] - -[[package]] -name = "snapbox-macros" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" -dependencies = [ - "anstream 0.5.0", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socks" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" -dependencies = [ - "byteorder", - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subprocess" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "2.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", -] - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix 0.38.9", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.23", - "windows-sys", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" -dependencies = [ - "deranged", - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "trycmd" -version = "0.14.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6a42f89ccf3c6ee115608a68e256c172734d525a4ac36d4a17a6d4a8108149" -dependencies = [ - "glob", - "humantime", - "humantime-serde", - "rayon", - "serde", - "shlex", - "snapbox", - "toml_edit", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" -dependencies = [ - "base64", - "log", - "native-tls", - "once_cell", - "rustls", - "rustls-webpki 0.100.2", - "serde", - "serde_json", - "socks", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - -[[package]] -name = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 6b911251501b..7a72bc360253 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,21 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-tMYuhUb1e/wTMZGwrAa3bz3INAld/ZtQzJqpeG0w/G8="; + hash = "sha256-Y5tnY8EZJcVhYyVTpvcT6DFbPSmmw3+knzkMVvQxQbI="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "cargo-test-macro-0.1.0" = "sha256-yE8BJMTRBT3P29t5ygMCybs0CYDcFLVlxi1L0LkBV9Q="; - }; - }; + cargoHash = "sha256-X8wQvLSvZ7rrDfX423SDB5QDDMoeDDFvJZKO92CLycg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/development/tools/semantic-release/default.nix index fb8f568c31d9..95f92919d15d 100644 --- a/pkgs/development/tools/semantic-release/default.nix +++ b/pkgs/development/tools/semantic-release/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "24.1.0"; + version = "24.1.1"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-k1sqr41ctlBYmN3QdoPDVajQtDGrQMlvBqGHsxBZ+8U="; + hash = "sha256-BGSe05I1NconPkPCzGOOLPbH/JSlwXvAWbViJVYMU/c="; }; - npmDepsHash = "sha256-6I5WUUkvj5Ob9By00FpxiNMiLU5sMnqG03kHJBrndHs="; + npmDepsHash = "sha256-DsBklxeY9RbvFsEA56vkmvVms+W9mr9qA/JVgAgs81k="; dontNpmBuild = true; diff --git a/pkgs/games/gimx/conf.patch b/pkgs/games/gimx/conf.patch index 875cc68824ac..1040a6192f38 100644 --- a/pkgs/games/gimx/conf.patch +++ b/pkgs/games/gimx/conf.patch @@ -7,7 +7,7 @@ index 451fc48..ed45f4d 100644 snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); - -+ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", file); } ++ snprintf(file_path, sizeof(file_path), "%s", file); if(read_file(file_path) == -1) { gerror("read_file failed\n"); @@ -20,7 +20,7 @@ index 700cae9..9143d8b 100755 snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); - -+ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); } ++ snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); FILE * fp = gfile_fopen(file_path, "r"); if (fp == NULL) { diff --git a/pkgs/games/gimx/custom/Dualshock4.xml b/pkgs/games/gimx/custom/Dualshock4.xml deleted file mode 100644 index 45ee5ed7c1c1..000000000000 --- a/pkgs/games/gimx/custom/Dualshock4.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 4173ac0cc2d6..8f81ab09357d 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -1,103 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch -, makeWrapper, curl, libusb1, xorg, libxml2 -, ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, bluez, libxml2, ncurses5, libmhash, xorg }: let gimx-config = fetchFromGitHub { owner = "matlo"; repo = "GIMX-configurations"; rev = "c20300f24d32651d369e2b27614b62f4b856e4a0"; - sha256 = "02wcjk8da188x7y0jf3p0arjdh9zbb0lla3fxdb28b1xyybfvx5p"; + hash = "sha256-t/Ttlvc9LCRW624oSsFaP8EmswJ3OAn86QgF1dCUjAs="; }; in stdenv.mkDerivation rec { pname = "gimx"; - version = "unstable-2021-08-31"; + version = "8.0"; src = fetchFromGitHub { owner = "matlo"; repo = "GIMX"; - rev = "58d2098dce75ed4c90ae649460d3a7a150f4ef0a"; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; + hash = "sha256-BcFLdQgEAi6Sxyb5/P9YAIkmeXNZXrKcOa/6g817xQg="; }; - patches = [ - ./conf.patch - - # gcc-13 build fixes: - # https://github.com/matlo/GIMX/pull/705 - (fetchpatch { - name = "gcc-13-headers.patch"; - url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch"; - hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs="; - }) - (fetchpatch { - name = "gcc-13-protos.patch"; - url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch"; - hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU="; - }) - ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + patches = [ ./conf.patch ./gcc14.patch ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - curl libusb1 bluez libxml2 ncurses5 libmhash - xorg.libX11 xorg.libXi xorg.libXext - ]; - - postPatch = lib.optionals gimxPdpGamepad '' - substituteInPlace ./shared/gimxcontroller/include/x360.h \ - --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" - substituteInPlace ./loader/firmware/EMU360.hex \ - --replace "1B210001" "1B211001" \ - --replace "09210001" "09211001" \ - --replace "5E048E021001" "6F0E13020001" - ''; - + buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash xorg.libX11 xorg.libXi ]; makeFlags = [ "build-core" ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=address" - "-Wno-error=deprecated-declarations" - "-Wno-error=use-after-free" - ]; - installPhase = '' runHook preInstall mkdir -p $out - substituteInPlace ./core/Makefile --replace "chmod ug+s" "echo" - + substituteInPlace ./core/Makefile --replace-fail "chmod ug+s" "echo" export DESTDIR="$out" make install-shared install-core mv $out/usr/lib $out/lib mv $out/usr/bin $out/bin - rmdir $out/usr + cp -r ${gimx-config}/Linux $out/share + + makeWrapper $out/bin/gimx $out/bin/gimx-ds4 \ + --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ + --add-flags "-c $out/share/Dualshock4.xml" runHook postInstall ''; - postInstall = '' - mkdir -p $out/share - cp -r ./loader/firmware $out/share/firmware - cp -r ${gimx-config}/Linux $out/share/config - cp -r ${./custom} $out/share/custom - - makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \ - --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ - --add-flags "-c $out/share/custom/Dualshock4.xml" - - makeWrapper $out/bin/gimx $out/bin/gimx-xboxonepad \ - --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ - --add-flags "-c $out/share/config/XOnePadUsb.xml" - ''; - meta = with lib; { homepage = "https://github.com/matlo/GIMX"; description = "Game Input Multiplexer"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ bb2020 ]; }; } diff --git a/pkgs/games/gimx/gcc14.patch b/pkgs/games/gimx/gcc14.patch new file mode 100644 index 000000000000..b736891f07ea --- /dev/null +++ b/pkgs/games/gimx/gcc14.patch @@ -0,0 +1,26 @@ +diff --git a/core/config_reader.c b/core/config_reader.c +index 451fc48..737d27c 100644 +--- a/core/config_reader.c ++++ b/core/config_reader.c +@@ -17,7 +17,7 @@ + #include "../directories.h" + #include "macros.h" + #include +- ++#include + /* + * These variables are used to read the configuration. + */ +diff --git a/core/gimx.c b/core/gimx.c +index 700cae9..693f72f 100755 +--- a/core/gimx.c ++++ b/core/gimx.c +@@ -8,7 +8,7 @@ + #include //to print errors + #include //to print errors + #include //PATH_MAX +- ++#include + #ifndef WIN32 + #include //to disable/enable echo + #include diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index ac8c765ac94c..456c36784d5f 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -12,29 +12,29 @@ let "unknown"; # These files can be found in src/evaluate.h - nnueBigFile = "nn-b1a57edbea57.nnue"; + nnueBigFile = "nn-1111cefa1111.nnue"; nnueBig = fetchurl { name = nnueBigFile; url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}"; - sha256 = "sha256-saV+2+pXTKi4jWg3RzhFeRvrU9iF+H+G1czdVln787I="; + sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ="; }; - nnueSmallFile = "nn-baff1ede1f90.nnue"; + nnueSmallFile = "nn-37f18f62d772.nnue"; nnueSmall = fetchurl { name = nnueSmallFile; url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}"; - sha256 = "sha256-uv8e3h+Qwd0bT3cvHv8phIghgB6BhjRdp/DrQSG9b2M="; + sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; }; in stdenv.mkDerivation rec { pname = "stockfish"; - version = "16.1"; + version = "17"; src = fetchFromGitHub { owner = "official-stockfish"; repo = "Stockfish"; rev = "sf_${version}"; - sha256 = "sha256-xTtjfJgEHF0SQT9Fw/9RLZA0Quh00jrIbihr7IYCm2U="; + sha256 = "sha256-oXvLaC5TEUPlHjhm7tOxpNPY88QxYHFw+Cev3Q8NEeQ="; }; postUnpack = '' @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro siraben ]; + maintainers = with maintainers; [ luispedro siraben thibaultd ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; license = licenses.gpl3Only; }; diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 81874617f70a..8019e64ea588 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -63,6 +63,7 @@ kirigami-addons = self.callPackage ./misc/kirigami-addons {}; kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {}; kio-fuse = self.callPackage ./misc/kio-fuse {}; + klevernotes = self.callPackage ./misc/klevernotes {}; ktextaddons = self.callPackage ./misc/ktextaddons {}; kunifiedpush = self.callPackage ./misc/kunifiedpush {}; kup = self.callPackage ./misc/kup {}; diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix new file mode 100644 index 000000000000..3998a5a940da --- /dev/null +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -0,0 +1,38 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qtsvg, + qtwebengine, +}: +mkKdeDerivation rec { + pname = "klevernotes"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; + hash = "sha256-9nXOaa2/DyJO3nXGbnvPaYjXFrVoAgx52th67l5geOU="; + }; + + extraBuildInputs = [ + qtsvg + qtwebengine + ]; + + meta.license = with lib.licenses; [ + bsd3 + cc-by-sa-40 + cc0 + # TODO: add FSFAP license + gpl2Plus + gpl3Only + gpl3Plus + lgpl2Only + lgpl2Plus + lgpl21Only + lgpl21Plus + lgpl3Only + lgpl3Plus + mit + ]; +} diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 22d69959e21f..dd617562aa66 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.10"; + tag = "0.3.11"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-GFqBRZMoBBRRrWAhRKJrxawPS4z+xVkuHSlCoSrMEEI="; + hash = "sha256-Vt63JA9VNIuigSmDp8TuCpShebCsssrBFIsI7HUM5q0="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 7808788fbdcb..8eed47235f06 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.31.30508.7"; + version = "24.35.30872.22"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-8oerVjEeqouOT0+9YgNYxK2200XyUSPu5hDnZg+Ong4="; + hash = "sha256-OI1pyH6g4U6FI2zE63oU9y8e39VgZUO0tSIOsOOon88="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index cf322e59bdc8..a9e75b651156 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,12 +7,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.50"; - hash = "sha256-NaAJMsOlN1T/KfE2lbQdeoS/B9l2YdVMDdmrN9HygHw="; + version = "6.6.51"; + hash = "sha256-dNUTePfL6cAA0EmEG/D36dNJUobDRBHR5+BYrLIYot4="; }; main = { - version = "6.10.9"; - hash = "sha256-hzSWeyJF2JeP12M1PP+CgcFKMahjTw4pE7PcAuozksw="; + version = "6.10.10"; + hash = "sha256-abxhlF0zmY9WvcQ+FnkR5fNMvrw+oTCIMaCs8DFJ+oA="; }; }; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix deleted file mode 100644 index 756bd99816fb..000000000000 --- a/pkgs/os-specific/linux/powertop/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gettext -, libnl -, ncurses -, pciutils -, pkg-config -, zlib -, autoreconfHook -, autoconf-archive -, nix-update-script -, testers -, powertop -, xorg -}: - -stdenv.mkDerivation rec { - pname = "powertop"; - version = "2.15"; - - src = fetchFromGitHub { - owner = "fenrus75"; - repo = pname; - rev = "v${version}"; - hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M="; - }; - - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; - buildInputs = [ gettext libnl ncurses pciutils zlib ]; - - postPatch = '' - substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" - substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "${lib.getExe xorg.xset}" - substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool" - ''; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = powertop; - command = "powertop --version"; - inherit version; - }; - }; - - meta = with lib; { - inherit (src.meta) homepage; - changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}"; - description = "Analyze power consumption on Intel-based laptops"; - mainProgram = "powertop"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fpletz anthonyroussel ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 263fcc448097..56e37ec0b847 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,8 +1,8 @@ let genericBuild = - { pkgs, lib, stdenv, fetchFromGitHub + { lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils - , linuxKernel + , linuxPackages , perl , configFile ? "all" @@ -201,12 +201,8 @@ let passthru = { inherit enableMail kernelModuleAttribute; - latestCompatibleLinuxPackages = lib.pipe linuxKernel.packages [ - builtins.attrValues - (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.pname == "linux" && kernelCompatible kPkgs.kernel)) - (builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version))) - lib.last - ]; + latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages ; + # The corresponding userspace tools to this instantiation # of the ZFS package set. userspaceTools = genericBuild (outerArgs // { diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index f071ef458944..a590036ea5a2 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.7"; + version = "0.13.8"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-A6rQ8zqpV6SBpiALIPMF1nZtGvUtzoiTE2Rioh3T1WA="; + hash = "sha256-zUpZdG2cdZ95L70qLG2HaUlD+G66XTi4f1V4+ZZAh30="; }; - vendorHash = "sha256-ByRCI4MuU8/ilbeNNOXSsTlBVHL5MkxLHItEGeGC9MQ="; + vendorHash = "sha256-rGOB1ikY3BgChvD1YZUF66g8P6gE29b/k9kxvHR0+WQ="; subPackages = [ # The server diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 860dadafe331..eea3a1881e5f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.9.1"; + version = "2024.9.2"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -4494,7 +4494,8 @@ aiounifi ]; "unifi_direct" = ps: with ps; [ - ]; # missing inputs: unifi_ap + unifi-ap + ]; "unifiled" = ps: with ps; [ unifiled ]; diff --git a/pkgs/servers/home-assistant/custom-components/dwd/default.nix b/pkgs/servers/home-assistant/custom-components/dwd/default.nix index a7b1da7bddea..5d8cba11f2d7 100644 --- a/pkgs/servers/home-assistant/custom-components/dwd/default.nix +++ b/pkgs/servers/home-assistant/custom-components/dwd/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hg1337"; domain = "dwd"; - version = "2024.4.0"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "hg1337"; repo = "homeassistant-dwd"; rev = version; - hash = "sha256-2bmLEBt6031p9SN855uunq7HrRJ9AFokw8t4CSBidTM="; + hash = "sha256-9zS6ufy7tYt1KwFeqdg0Az8xz3x5UzU9ZO9aOyWjdQE="; }; dependencies = [ defusedxml ]; @@ -26,6 +26,9 @@ buildHomeAssistantComponent rec { description = "Custom component for Home Assistant that integrates weather data (measurements and forecasts) of Deutscher Wetterdienst"; homepage = "https://github.com/hg1337/homeassistant-dwd"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ + hexa + emilylange + ]; }; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c15f06d23ee0..5459606f7cb9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -408,7 +408,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.9.1"; + hassVersion = "2024.9.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-jwkLlmwP9rxwGFVagVyVrO6scOMzuva1Pz706nb3Ato="; + hash = "sha256-qAnEdH1MDPsCKDubpYL5AswcsaPqGm+TrKdBcDD3np8="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-0+tXKnkcpjISqapvFh7nPKfPxJrSACuxulejk4pCPUQ="; + hash = "sha256-gWQU18GfnsxttRzpoN9WeNeHOgioTxF9DmG2SwNuzEY="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index e01f3c8972f8..b40c1e1e1fc6 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240906.0"; + version = "20240909.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-iWSpwgp5mdAhuZgF+1uNL0aovjM7CZ4SbM0HHQktfAk="; + hash = "sha256-inxDdsJQ58Jg+3bc382l8z/PbChWI0pfZR/k+wyexvE="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index e62e43ff7055..c17f0fcec98f 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -13,19 +13,19 @@ let pname = "matrix-appservice-irc"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LlcGcE3ik/xaiySyW5vfemGmukR7rlZrhfZOJwwfLDM="; + hash = "sha256-ugnFlvu5kkfTHPD44/F8OvGUx55VcHQvTS99T7Wc2fE="; }; yarnOfflineCache = fetchYarnDeps { name = "${pname}-${version}-offline-cache"; yarnLock = "${src}/yarn.lock"; - hash = "sha256-VUqi1OBuUeLbjDH0yBZDSkJBkaMWdzYddcHB5rikJwQ="; + hash = "sha256-PObpXC8VIdsqhOZLLeHdS9mvXnjNQOrs2vlTeK5keRw="; }; in diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 84e75f90c442..1f97fad7468f 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1442"; + version = "2.0-1455"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-D6Xdij92bDUchkSTT9/ADaNALqCyYwL9EnLqma48alg="; + hash = "sha256-R555u33S5jmqIKdDtRhMbfCMe5sG3x94naPX+qgrwHY="; }; dontConfigure = true; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 2693aa1f7d3a..3939c25b67bf 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-6mmjIrG81uaNfRAXW0YORZfviFwJd1QyORfvMucNWdI="; + sha256 = "sha256-Ynhom4WX1ME6/uI0HQ83S1DgLYN1HjUxKk5CUL/Fgzk="; }; - vendorHash = "sha256-PWjcQD64DEJylRdSUA55iCcKHMdyMh5PrfWnhZz3LOg="; + vendorHash = "sha256-FHvppbAAKW2Nf5GKhMWoMuOgqAp6deOSE61hg7dASqo="; ldflags = [ "-w" @@ -27,19 +27,19 @@ buildGoModule rec { # Some tests require access to scaleway's API, failing when sandboxed preCheck = '' - substituteInPlace internal/core/bootstrap_test.go \ - --replace "TestInterruptError" "SkipInterruptError" + substituteInPlace core/bootstrap_test.go \ + --replace-warn "TestInterruptError" "SkipInterruptError" substituteInPlace internal/e2e/errors_test.go \ - --replace "TestStandardErrors" "SkipStandardErrors" + --replace-warn "TestStandardErrors" "SkipStandardErrors" substituteInPlace internal/e2e/human_test.go \ - --replace "TestTestCommand" "SkipTestCommand" \ - --replace "TestHumanCreate" "SkipHumanCreate" \ - --replace "TestHumanList" "SkipHumanList" \ - --replace "TestHumanUpdate" "SkipHumanUpdate" \ - --replace "TestHumanGet" "SkipHumanGet" \ - --replace "TestHumanDelete" "SkipHumanDelete" + --replace-warn "TestTestCommand" "SkipTestCommand" \ + --replace-warn "TestHumanCreate" "SkipHumanCreate" \ + --replace-warn "TestHumanList" "SkipHumanList" \ + --replace-warn "TestHumanUpdate" "SkipHumanUpdate" \ + --replace-warn "TestHumanGet" "SkipHumanGet" \ + --replace-warn "TestHumanDelete" "SkipHumanDelete" substituteInPlace internal/e2e/sdk_errors_test.go \ - --replace "TestSdkStandardErrors" "SkipSdkStandardErrors" + --replace-warn "TestSdkStandardErrors" "SkipSdkStandardErrors" ''; doInstallCheck = true; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 4b969c11ba78..5b7242364834 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-07-25"; + version = "0-unstable-2024-09-16"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "122a3f239ed2f24271eb61b9aa3060fa06b820ac"; - sha256 = "sha256-tUb4YeYXFWpxV4GONoxo2QwRqbBemqm2sFP6jkoiBWA="; + rev = "d9ab0465aa2849ff645c027110c48899d5ec6ca8"; + sha256 = "sha256-usrHtVGkp++mU9rWI3u3vXJ8aAycujw9+5VQd0X0idY="; }; cmakeFlags = [ diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix deleted file mode 100644 index dce23ff8f9af..000000000000 --- a/pkgs/tools/misc/ipxe/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, unstableGitUpdater, buildPackages -, gnu-efi, mtools, openssl, perl, xorriso, xz -, syslinux ? null -, embedScript ? null -, additionalTargets ? {} -, additionalOptions ? [] -}: - -let - targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 { - "bin-x86_64-efi/ipxe.efi" = null; - "bin-x86_64-efi/ipxe.efirom" = null; - "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; - "bin-x86_64-efi/snp.efi" = null; - } // lib.optionalAttrs stdenv.hostPlatform.isx86 { - "bin/ipxe.dsk" = null; - "bin/ipxe.usb" = null; - "bin/ipxe.iso" = null; - "bin/ipxe.lkrn" = null; - "bin/undionly.kpxe" = null; - } // lib.optionalAttrs stdenv.isAarch32 { - "bin-arm32-efi/ipxe.efi" = null; - "bin-arm32-efi/ipxe.efirom" = null; - "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; - "bin-arm32-efi/snp.efi" = null; - } // lib.optionalAttrs stdenv.isAarch64 { - "bin-arm64-efi/ipxe.efi" = null; - "bin-arm64-efi/ipxe.efirom" = null; - "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; - "bin-arm64-efi/snp.efi" = null; - }; -in - -stdenv.mkDerivation rec { - pname = "ipxe"; - version = "1.21.1-unstable-2024-08-15"; - - nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - strictDeps = true; - - src = fetchFromGitHub { - owner = "ipxe"; - repo = "ipxe"; - rev = "950f6b5861d8d6b247b37e4e1401d26d8f908ee8"; - hash = "sha256-Zf2ZblKUyKPo0YdzQFeCEAnYkvWDsmuTS9htvSybpXo="; - }; - - postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' - substituteInPlace src/util/genfsimg --replace " syslinux " " true " - ''; # calling syslinux on a FAT image isn't going to work - - # not possible due to assembler code - hardeningDisable = [ "pic" "stackprotector" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - makeFlags = - [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. - "CROSS=${stdenv.cc.targetPrefix}" - ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; - - - enabledOptions = [ - "PING_CMD" - "IMAGE_TRUST_CMD" - "DOWNLOAD_PROTO_HTTP" - "DOWNLOAD_PROTO_HTTPS" - ] ++ additionalOptions; - - configurePhase = '' - runHook preConfigure - for opt in ${lib.escapeShellArgs enabledOptions}; do echo "#define $opt" >> src/config/general.h; done - substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo - '' + lib.optionalString stdenv.hostPlatform.isx86 '' - substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux - '' + '' - runHook postConfigure - ''; - - preBuild = "cd src"; - - buildFlags = lib.attrNames targets; - - installPhase = '' - runHook preInstall - - mkdir -p $out - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to: - if to == null - then "cp -v ${from} $out" - else "cp -v ${from} $out/${to}") targets)} - - # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending - # let's provide it as a symlink to be compatible in this case. - ln -s undionly.kpxe $out/undionly.kpxe.0 - - runHook postInstall - ''; - - enableParallelBuilding = true; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; - { description = "Network boot firmware"; - homepage = "https://ipxe.org/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index d654b75e4990..fb0e8600c459 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+BQWmb09kCAjJioutD9xOWxQoZtBrTJFp0yAun/nDCc="; + hash = "sha256-yPIlijm5NBtBT2+bkS0sJvPb/Lwqq/ZOcl5g848BvRA="; }; - vendorHash = "sha256-LCA59LijHLpM1bo4/yuFGrnk0g9DSXEZwmBUspGylV8="; + vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix index 800bf07d754a..848fccaf17f2 100644 --- a/pkgs/tools/networking/v2raya/default.nix +++ b/pkgs/tools/networking/v2raya/default.nix @@ -1,13 +1,19 @@ -{ lib -, fetchFromGitHub -, mkYarnPackage -, buildGoModule -, makeWrapper -, v2ray -, v2ray-geoip -, v2ray-domain-list-community -, symlinkJoin -, fetchYarnDeps +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + fetchYarnDeps, + symlinkJoin, + + yarnConfigHook, + yarnBuildHook, + nodejs, + + makeWrapper, + v2ray, + v2ray-geoip, + v2ray-domain-list-community, }: let pname = "v2raya"; @@ -16,52 +22,44 @@ let src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-tXVyroQ2yXwLe+OulvVQYgfd9EcC87S0L8d7w5gLnMI="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; - guiSrc = "${src}/gui"; - web = mkYarnPackage { - inherit pname version; + web = stdenv.mkDerivation { + inherit pname version src; - src = guiSrc; - packageJSON = ./package.json; + sourceRoot = "${src.name}/gui"; offlineCache = fetchYarnDeps { - yarnLock = "${guiSrc}/yarn.lock"; - sha256 = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw="; + yarnLock = "${src}/gui/yarn.lock"; + hash = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw="; }; - buildPhase = '' - runHook preBuild - OUTPUT_DIR=$out yarn --offline build - runHook postBuild - ''; + env.OUTPUT_DIR = placeholder "out"; - configurePhase = '' - runHook preConfigure - cp -r $node_modules node_modules - chmod +w node_modules - runHook postConfigure - ''; - - distPhase = "true"; - - dontInstall = true; - dontFixup = true; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; }; assetsDir = symlinkJoin { name = "assets"; - paths = [ v2ray-geoip v2ray-domain-list-community ]; + paths = [ + v2ray-geoip + v2ray-domain-list-community + ]; }; in buildGoModule { - inherit pname version; + inherit pname version src; + + sourceRoot = "${src.name}/service"; - src = "${src}/service"; vendorHash = "sha256-8MSNTKeN0N2/yaHnXsKmxzw9vRy+E5q60IpwLycqC2I="; ldflags = [ @@ -73,15 +71,16 @@ buildGoModule { subPackages = [ "." ]; nativeBuildInputs = [ makeWrapper ]; + preBuild = '' cp -a ${web} server/router/web ''; postInstall = '' - install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications - install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps + install -Dm 444 ../install/universal/v2raya.desktop -t $out/share/applications + install -Dm 444 ../install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps substituteInPlace $out/share/applications/v2raya.desktop \ - --replace 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya' + --replace-fail 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya' wrapProgram $out/bin/v2rayA \ --prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \ diff --git a/pkgs/tools/networking/v2raya/package.json b/pkgs/tools/networking/v2raya/package.json deleted file mode 100644 index a4b16d15821c..000000000000 --- a/pkgs/tools/networking/v2raya/package.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "v2raya", - "version": "0.1.0", - "private": true, - "license": "GPL-3.0", - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" - }, - "resolutions": { - "@achrinza/node-ipc": "^10", - "@achrinza/event-pubsub": "^5" - }, - "dependencies": { - "@achrinza/node-ipc": "^10.1.10", - "@mdi/font": "^5.8.55", - "@nuintun/qrcode": "^3.3.0", - "@vue/babel-preset-app": "^4.2.2", - "axios": "^0.21.1", - "buefy": "^0.9.22", - "clipboard": "^2.0.4", - "dayjs": "^1.10.6", - "js-base64": "^2.5.1", - "nanoid": "^3.1.23", - "normalize.css": "^8.0.1", - "pace-js": "^1.2.4", - "qrcode": "^1.4.2", - "register-service-worker": "^1.6.2", - "vue": "^2.7.14", - "vue-i18n": "^8.15.3", - "vue-router": "^3.0.6", - "vue-virtual-scroller": "^1.0.10", - "vuex": "^3.0.1", - "webpack-iconfont-plugin-nodejs": "^1.0.16" - }, - "devDependencies": { - "@babel/core": "^7.12.16", - "@babel/eslint-parser": "^7.12.16", - "@vue/cli-plugin-babel": "~5.0.8", - "@vue/cli-plugin-eslint": "~5.0.8", - "@vue/cli-plugin-router": "~5.0.8", - "@vue/cli-plugin-vuex": "~5.0.8", - "@vue/cli-service": "~5.0.8", - "@vue/eslint-config-prettier": "^5.0.0", - "compression-webpack-plugin": "^10.0.0", - "css-loader": "^5.2.0", - "eslint": "^7.32.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-vue": "^8.0.3", - "highlight.js": "^11.4.0", - "prettier": "^2.4.1", - "sass": "^1.19.0", - "sass-loader": "^8.0.0", - "terser-webpack-plugin": "^5.3.6", - "urijs": "^1.19.11" - } -} diff --git a/pkgs/tools/nix/fh/default.nix b/pkgs/tools/nix/fh/default.nix index ec1354e407e1..7e99d3aa068a 100644 --- a/pkgs/tools/nix/fh/default.nix +++ b/pkgs/tools/nix/fh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fh"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "fh"; rev = "v${version}"; - hash = "sha256-HC/PNdBOm4mR2p6qI2P+aS+lFabKWSiPhiBSJUsmcv4="; + hash = "sha256-+Q7mZ2uzMjShKWVvYLz9qH8g0w8oP93lNlJiYxFFoAI="; }; - cargoHash = "sha256-pWPFiDRF9avZSSUtxDaTfl9ZVUEcnO/CY0VWByaGimo="; + cargoHash = "sha256-DJOj9EJswnPIm66u585k4ZWSi6Su/naQ+myQuLiGLFE="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 018fe9ffb89f..d87d388cd2e8 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation { --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; + /** The nix package that nix-serve got its nix perl bindings from. */ + passthru.nix = nix; + passthru.tests = { nix-serve = nixosTests.nix-serve; nix-serve-ssh = nixosTests.nix-serve-ssh; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 7f65e0119f3e..416e3cf1fdf5 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terrascan"; - version = "1.19.8"; + version = "1.19.9"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+fg482jVMc9IDH0MKSbXaU44QXH/wdjXbztqKNqJjbs="; + hash = "sha256-4XIhmUUOSROwEPSB+DcMOfG5+q/pmWkVUwKGrWVcNtM="; }; vendorHash = "sha256-yQien8v7Ru+JWLou9QfyKZAR2ENMHO2aF2vzuWyQcjY="; diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 0d0d1070bbd7..6ffb4d48253f 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.3"; + version = "0.37.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-RCvqoikROFpFvza24PGocdxFaOI6hZLSy3Jnag7Oz4s="; + sha256 = "sha256-ezF8cV3JPE/GObpTc4wPw/YcQrOKNi2bsRs3svLWpV8="; }; - vendorHash = "sha256-iKfNAQRsVUjhUmDH/HevnDnocQm4k9jEfW40+AncojM="; + vendorHash = "sha256-jwxKFgUhBilX/HxwjtHwLzmyUFrM8snM6Sq1CdY7oOY="; proxyVendor = true; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 2b714b56def5..464c5f67ed57 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "3.1.3"; + version = "4.0.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - hash = "sha256-/thPPueNrYzbxxZYAqlxZ2GEsceCzd+LkI84S8AS1mo="; + hash = "sha256-WIJyCpnlD6/c7PG+ZPmUT8qfPelRY9Od1Dk9Ro1y1yY="; }; buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ]; + configureFlags = [ "--enable-release" ]; makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ "release" ]; # "release" enables compiler optimizations meta = with lib; { description = "Breadth-first version of the UNIX find command"; diff --git a/pkgs/tools/system/mediawriter/default.nix b/pkgs/tools/system/mediawriter/default.nix index e2ff1f610782..cc6cf69f5683 100644 --- a/pkgs/tools/system/mediawriter/default.nix +++ b/pkgs/tools/system/mediawriter/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; rev = "refs/tags/${version}"; - hash = "sha256-KyABM3XIHvd9kT7aayYivGw6kjLf55Gpkk041BQ4yw0="; + hash = "sha256-w32Ps+GrbMq4Wot6vWyZS03Tv2rfTDnFLS7VwrcJLcc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index ad4e10500177..757ee6d75d8f 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.1.6"; + version = "8.1.7"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-bjYfeEsKO4hkLfGBVqFTomh0P3dhlvvq+PqEiZHySLs="; + hash = "sha256-oQL3EI4yTQOi+BM9ZkTILYulWD13Pof3JC1KVLSJWcA="; }; - npmDepsHash = "sha256-bAxqxxqhRE3Vw6NtKK5dnM41ypgq7FIpgK0hEpZ53/Q="; + npmDepsHash = "sha256-colrMoVN5uGVBeCvDfEU9tjjW9qkaiSKHPmTZ83EgCk="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 5ccf8070c3c9..455e6f108c88 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,24 +1,33 @@ { lib -, pkg-config , buildGoModule -, fetchFromGitHub -, makeWrapper +, callPackage +, cdrkit , coreutils +, debootstrap +, fetchFromGitHub , gnupg , gnutar -, squashfsTools -, debootstrap -, callPackage +, hivex +, makeWrapper , nixosTests +, pkg-config +, squashfsTools +, stdenv +, wimlib }: let bins = [ coreutils + debootstrap gnupg gnutar squashfsTools - debootstrap + ] ++ lib.optionals stdenv.isx86_64 [ + # repack-windows deps + cdrkit + hivex + wimlib ]; in buildGoModule rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58e8b4b232d4..1254d45dda59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -139,7 +139,7 @@ with pkgs; unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { }; - nix-update-script = callPackage ../common-updater/nix-update.nix { }; + inherit (nix-update) nix-update-script; ### Push NixOS tests inside the fixed point @@ -227,8 +227,6 @@ with pkgs; quickgui = callPackage ../applications/virtualization/quickgui { }; - adcli = callPackage ../os-specific/linux/adcli { }; - alda = callPackage ../development/interpreters/alda { }; align = callPackage ../tools/text/align { }; @@ -2980,8 +2978,6 @@ with pkgs; alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; - amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { }; - amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { @@ -3171,8 +3167,6 @@ with pkgs; aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; - aws-encryption-sdk-cli = callPackage ../tools/admin/aws-encryption-sdk-cli { }; - aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { }; awscli = callPackage ../tools/admin/awscli { }; @@ -6265,8 +6259,6 @@ with pkgs; ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { }; - ccid = callPackage ../tools/security/ccid { }; - ccrypt = callPackage ../tools/security/ccrypt { }; ccze = callPackage ../tools/misc/ccze { }; @@ -8313,8 +8305,6 @@ with pkgs; sbsigntool = callPackage ../tools/security/sbsigntool { }; - sonic-server = callPackage ../servers/search/sonic-server { }; - gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; gsmlib = callPackage ../development/libraries/gsmlib @@ -8842,8 +8832,6 @@ with pkgs; ipv6calc = callPackage ../tools/networking/ipv6calc { }; - ipxe = callPackage ../tools/misc/ipxe { }; - irker = callPackage ../servers/irker { }; iroh = callPackage ../applications/networking/iroh { }; @@ -8924,8 +8912,6 @@ with pkgs; jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - jira-cli-go = callPackage ../development/tools/jira-cli-go { }; - jirafeau = callPackage ../servers/web-apps/jirafeau { }; jitterentropy = callPackage ../development/libraries/jitterentropy { }; @@ -17164,7 +17150,8 @@ with pkgs; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 electron-chromedriver_30 - electron-chromedriver_31; + electron-chromedriver_31 + electron-chromedriver_32; electron_24 = electron_24-bin; electron_27 = electron_27-bin; @@ -21841,8 +21828,6 @@ with pkgs; libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; - libspatialindex = callPackage ../development/libraries/libspatialindex { }; - libspatialite = callPackage ../development/libraries/libspatialite { }; libstatgrab = callPackage ../development/libraries/libstatgrab { @@ -24385,8 +24370,6 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - asouldocs = callPackage ../servers/asouldocs { }; - atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; @@ -25525,8 +25508,6 @@ with pkgs; tailspin = callPackage ../tools/misc/tailspin { }; - thanos = callPackage ../servers/monitoring/thanos { }; - trafficserver = callPackage ../servers/http/trafficserver { }; inherit (callPackages ../servers/http/tomcat { }) @@ -25558,8 +25539,6 @@ with pkgs; matomo_5 matomo-beta; - axis2 = callPackage ../servers/http/tomcat/axis2 { }; - inherit (callPackages ../servers/unifi { }) unifi7 unifi8; @@ -26627,8 +26606,6 @@ with pkgs; dnsdist = callPackage ../servers/dns/dnsdist { }; - powertop = callPackage ../os-specific/linux/powertop { }; - pps-tools = callPackage ../os-specific/linux/pps-tools { }; procps = if stdenv.isLinux @@ -29252,10 +29229,17 @@ with pkgs; emacs28-gtk2 emacs28-gtk3 emacs28-nox + emacs29 emacs29-gtk3 emacs29-nox emacs29-pgtk + + emacs30 + emacs30-gtk3 + emacs30-nox + emacs30-pgtk + emacs28-macport emacs29-macport ; @@ -33729,8 +33713,6 @@ with pkgs; vivictpp = callPackage ../applications/video/vivictpp { }; - vpcs = callPackage ../applications/virtualization/vpcs { }; - primusLib = callPackage ../tools/X11/primus/lib.nix { nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; @@ -34139,7 +34121,6 @@ with pkgs; xkbmon = callPackage ../applications/misc/xkbmon { }; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; - win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; xfig = callPackage ../applications/graphics/xfig { }; @@ -37777,10 +37758,10 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_26 kops_1_27 kops_1_28 kops_1_29 + kops_1_30 ; kops = kops_1_29; @@ -38037,7 +38018,9 @@ with pkgs; nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; - nix-serve = callPackage ../tools/package-management/nix-serve { }; + nix-serve = callPackage ../tools/package-management/nix-serve { + nix = nixVersions.nix_2_18; + }; nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng; @@ -38081,8 +38064,6 @@ with pkgs; nvd = callPackage ../tools/package-management/nvd { }; - solfege = python3Packages.callPackage ../misc/solfege { }; - disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f8c31381060..2c4b0027a301 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16862,6 +16862,8 @@ self: super: with self; { unifi = callPackage ../development/python-modules/unifi { }; + unifi-ap = callPackage ../development/python-modules/unifi-ap { }; + unifi-discovery = callPackage ../development/python-modules/unifi-discovery { }; unify = callPackage ../development/python-modules/unify { };